firefox-kde.patch
changeset 1006 5ba9b67de554
parent 1005 6d716caa6abe
child 1007 65e317e42eff
equal deleted inserted replaced
1005:6d716caa6abe 1006:5ba9b67de554
     1 # HG changeset patch
     1 # HG changeset patch
     2 # Parent  c68a0b83e6eaebd87e9790659aef919e50b830c0
     2 # Parent  2de38c90f96ae846bb664f9a02ddfbcd5f662357
     3 
     3 
     4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
     4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
     5 new file mode 100644
     5 new file mode 100644
     6 --- /dev/null
     6 --- /dev/null
     7 +++ b/browser/base/content/browser-kde.xul
     7 +++ b/browser/base/content/browser-kde.xul
     8 @@ -0,0 +1,1320 @@
     8 @@ -0,0 +1,1252 @@
     9 +#filter substitution
     9 +#filter substitution
    10 +<?xml version="1.0"?>
    10 +<?xml version="1.0"?>
    11 +# -*- Mode: HTML -*-
    11 +# -*- Mode: HTML -*-
    12 +#
    12 +#
    13 +# This Source Code Form is subject to the terms of the Mozilla Public
    13 +# This Source Code Form is subject to the terms of the Mozilla Public
    71 +# All JS files which are not content (only) dependent that browser.xul
    71 +# All JS files which are not content (only) dependent that browser.xul
    72 +# wishes to include *must* go into the global-scripts.inc file
    72 +# wishes to include *must* go into the global-scripts.inc file
    73 +# so that they can be shared by macBrowserOverlay.xul.
    73 +# so that they can be shared by macBrowserOverlay.xul.
    74 +#include global-scripts.inc
    74 +#include global-scripts.inc
    75 +
    75 +
    76 +<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
    76 +<script type="application/javascript">
       
    77 +  Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
       
    78 +</script>
    77 +
    79 +
    78 +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
    80 +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
    79 +# browser-sets.inc file for sharing with hiddenWindow.xul.
    81 +# browser-sets.inc file for sharing with hiddenWindow.xul.
    80 +#define FULL_BROWSER_WINDOW
    82 +#define FULL_BROWSER_WINDOW
    81 +#include browser-sets.inc
    83 +#include browser-sets.inc
    93 +                accesskey="&pinTab.accesskey;"
    95 +                accesskey="&pinTab.accesskey;"
    94 +                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
    96 +                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
    95 +      <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true"
    97 +      <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true"
    96 +                accesskey="&unpinTab.accesskey;"
    98 +                accesskey="&unpinTab.accesskey;"
    97 +                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
    99 +                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
       
   100 +      <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
       
   101 +                accesskey="&duplicateTab.accesskey;"
       
   102 +                oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
    98 +      <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
   103 +      <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
    99 +                accesskey="&moveToNewWindow.accesskey;"
   104 +                accesskey="&moveToNewWindow.accesskey;"
   100 +                tbattr="tabbrowser-multiple"
   105 +                tbattr="tabbrowser-multiple"
   101 +                oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
   106 +                oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
   102 +#ifdef E10S_TESTING_ONLY
   107 +#ifdef E10S_TESTING_ONLY
   159 +           id="PopupAutoCompleteRichResult"
   164 +           id="PopupAutoCompleteRichResult"
   160 +           noautofocus="true"
   165 +           noautofocus="true"
   161 +           hidden="true"
   166 +           hidden="true"
   162 +           flip="none"
   167 +           flip="none"
   163 +           level="parent"
   168 +           level="parent"
   164 +           overflowpadding="30" />
   169 +           overflowpadding="15" />
   165 +
   170 +
       
   171 +   <!-- for date/time picker. consumeoutsideclicks is set to never, so that
       
   172 +        clicks on the anchored input box are never consumed. -->
   166 +    <panel id="DateTimePickerPanel"
   173 +    <panel id="DateTimePickerPanel"
   167 +           type="arrow"
   174 +           type="arrow"
   168 +           hidden="true"
   175 +           hidden="true"
   169 +           orient="vertical"
   176 +           orient="vertical"
   170 +           noautofocus="true"
   177 +           noautofocus="true"
   171 +           noautohide="true"
   178 +           norolluponanchor="true"
   172 +           consumeoutsideclicks="false"
   179 +           consumeoutsideclicks="never"
   173 +           level="parent"
   180 +           level="parent"
   174 +           tabspecific="true">
   181 +           tabspecific="true">
   175 +    </panel>
   182 +    </panel>
   176 +
   183 +
   177 +    <!-- for select dropdowns. The menupopup is what shows the list of options,
   184 +    <!-- for select dropdowns. The menupopup is what shows the list of options,
   270 +           consumeoutsideclicks="false"
   277 +           consumeoutsideclicks="false"
   271 +           mousethrough="always">
   278 +           mousethrough="always">
   272 +      <box id="UITourHighlight"></box>
   279 +      <box id="UITourHighlight"></box>
   273 +    </panel>
   280 +    </panel>
   274 +
   281 +
   275 +    <panel id="social-share-panel"
       
   276 +           class="social-panel"
       
   277 +           type="arrow"
       
   278 +           orient="vertical"
       
   279 +           onpopupshowing="SocialShare.onShowing()"
       
   280 +           onpopuphidden="SocialShare.onHidden()"
       
   281 +           hidden="true">
       
   282 +      <hbox class="social-share-toolbar">
       
   283 +        <toolbarbutton id="manage-share-providers" class="share-provider-button"
       
   284 +                       tooltiptext="&social.addons.label;"
       
   285 +                       oncommand="BrowserOpenAddonsMgr('addons://list/service');
       
   286 +                                  this.parentNode.parentNode.hidePopup();"/>
       
   287 +        <arrowscrollbox id="social-share-provider-buttons" orient="horizontal" flex="1" pack="end">
       
   288 +          <toolbarbutton id="add-share-provider" class="share-provider-button" type="radio"
       
   289 +                         group="share-providers" tooltiptext="&findShareServices.label;"
       
   290 +                         oncommand="SocialShare.showDirectory()"/>
       
   291 +        </arrowscrollbox>
       
   292 +      </hbox>
       
   293 +      <hbox id="share-container" flex="1"/>
       
   294 +    </panel>
       
   295 +    <panel id="sidebarMenu-popup"
   282 +    <panel id="sidebarMenu-popup"
   296 +           class="cui-widget-panel"
   283 +           class="cui-widget-panel"
   297 +           role="group"
   284 +           role="group"
   298 +           type="arrow"
   285 +           type="arrow"
   299 +           hidden="true"
   286 +           hidden="true"
   335 +    </panel>
   322 +    </panel>
   336 +
   323 +
   337 +    <menupopup id="toolbar-context-menu"
   324 +    <menupopup id="toolbar-context-menu"
   338 +               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
   325 +               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
   339 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
   326 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
   340 +                photonaccesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
   327 +                accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
   341 +                photonlabel="&customizeMenu.pinToOverflowMenu.label;"
   328 +                label="&customizeMenu.pinToOverflowMenu.label;"
   342 +                accesskey="&customizeMenu.moveToPanel.accesskey;"
       
   343 +                label="&customizeMenu.moveToPanel.label;"
       
   344 +                contexttype="toolbaritem"
   329 +                contexttype="toolbaritem"
   345 +                class="customize-context-moveToPanel"/>
   330 +                class="customize-context-moveToPanel"/>
   346 +      <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
   331 +      <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
   347 +                accesskey="&customizeMenu.removeFromToolbar.accesskey;"
   332 +                accesskey="&customizeMenu.removeFromToolbar.accesskey;"
   348 +                label="&customizeMenu.removeFromToolbar.label;"
   333 +                label="&customizeMenu.removeFromToolbar.label;"
   372 +                    redirected to the command element, thus preventing
   357 +                    redirected to the command element, thus preventing
   373 +                    listeners on the menupopup or further up the tree from
   358 +                    listeners on the menupopup or further up the tree from
   374 +                    seeing the command event pass by. The observes attribute is
   359 +                    seeing the command event pass by. The observes attribute is
   375 +                    here so that the menuitem is still disabled and re-enabled
   360 +                    here so that the menuitem is still disabled and re-enabled
   376 +                    correctly. -->
   361 +                    correctly. -->
   377 +      <menuitem oncommand="BrowserCustomizeToolbar()"
   362 +      <menuitem oncommand="gCustomizeMode.enter()"
   378 +                observes="cmd_CustomizeToolbars"
   363 +                observes="cmd_CustomizeToolbars"
   379 +                class="viewCustomizeToolbar"
   364 +                class="viewCustomizeToolbar"
   380 +                label="&viewCustomizeToolbar.label;"
   365 +                label="&viewCustomizeToolbar.label;"
   381 +                accesskey="&viewCustomizeToolbar.accesskey;"/>
   366 +                accesskey="&viewCustomizeToolbar.accesskey;"/>
   382 +    </menupopup>
   367 +    </menupopup>
   414 +                              gContextMenu = null;
   399 +                              gContextMenu = null;
   415 +                              updateEditUIVisibility();">
   400 +                              updateEditUIVisibility();">
   416 +#include browser-context.inc
   401 +#include browser-context.inc
   417 +    </menupopup>
   402 +    </menupopup>
   418 +
   403 +
   419 +    <menupopup id="placesContext">
   404 +    <menupopup id="placesContext"/>
   420 +      <menuseparator id="placesContext_recentlyBookmarkedSeparator"
       
   421 +                     ignoreitem="true"
       
   422 +                     hidden="true"/>
       
   423 +      <menuitem id="placesContext_hideRecentlyBookmarked"
       
   424 +                label="&hideRecentlyBookmarked.label;"
       
   425 +                accesskey="&hideRecentlyBookmarked.accesskey;"
       
   426 +                oncommand="BookmarkingUI.hideRecentlyBookmarked();"
       
   427 +                closemenu="single"
       
   428 +                ignoreitem="true"
       
   429 +                hidden="true"/>
       
   430 +      <menuitem id="placesContext_showRecentlyBookmarked"
       
   431 +                label="&showRecentlyBookmarked.label;"
       
   432 +                accesskey="&showRecentlyBookmarked.accesskey;"
       
   433 +                oncommand="BookmarkingUI.showRecentlyBookmarked();"
       
   434 +                closemenu="single"
       
   435 +                ignoreitem="true"
       
   436 +                hidden="true"/>
       
   437 +    </menupopup>
       
   438 +
   405 +
   439 +    <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top">
   406 +    <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top">
   440 +      <hbox>
   407 +      <hbox>
   441 +        <button class="ctrlTab-preview" flex="1"/>
   408 +        <button class="ctrlTab-preview" flex="1"/>
   442 +        <button class="ctrlTab-preview" flex="1"/>
   409 +        <button class="ctrlTab-preview" flex="1"/>
   448 +      <hbox pack="center">
   415 +      <hbox pack="center">
   449 +        <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/>
   416 +        <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/>
   450 +      </hbox>
   417 +      </hbox>
   451 +    </panel>
   418 +    </panel>
   452 +
   419 +
   453 +#ifdef MOZ_PHOTON_THEME
       
   454 +    <panel id="pageActionPanel"
   420 +    <panel id="pageActionPanel"
   455 +           class="cui-widget-panel"
   421 +           class="cui-widget-panel"
   456 +           role="group"
   422 +           role="group"
   457 +           type="arrow"
   423 +           type="arrow"
   458 +           hidden="true"
   424 +           hidden="true"
   459 +           flip="slide"
   425 +           flip="slide"
       
   426 +           photon="true"
   460 +           position="bottomcenter topright"
   427 +           position="bottomcenter topright"
   461 +           tabspecific="true"
   428 +           tabspecific="true"
   462 +           noautofocus="true"
   429 +           noautofocus="true"
   463 +           context="pageActionPanelContextMenu"
   430 +           copyURL-title="&pageAction.copyLink.label;"
   464 +           oncontextmenu="BrowserPageActions.onContextMenu(event);"
       
   465 +           copyURL-title="&copyURLCmd.label;"
       
   466 +           emailLink-title="&emailPageCmd.label;"
   431 +           emailLink-title="&emailPageCmd.label;"
   467 +           sendToDevice-title="&sendToDevice.label2;"
   432 +           sendToDevice-title="&pageAction.sendTabToDevice.label;"
   468 +           sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;">
   433 +           sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;">
   469 +      <photonpanelmultiview id="pageActionPanelMultiView"
   434 +      <photonpanelmultiview id="pageActionPanelMultiView"
   470 +                            mainViewId="pageActionPanelMainView"
   435 +                            mainViewId="pageActionPanelMainView"
   471 +                            viewCacheId="appMenu-viewCache">
   436 +                            viewCacheId="appMenu-viewCache">
   472 +        <panelview id="pageActionPanelMainView"
   437 +        <panelview id="pageActionPanelMainView"
       
   438 +                   context="pageActionPanelContextMenu"
       
   439 +                   oncontextmenu="BrowserPageActions.onContextMenu(event);"
   473 +                   class="PanelUI-subView">
   440 +                   class="PanelUI-subView">
   474 +          <vbox class="panel-subview-body"/>
   441 +          <vbox class="panel-subview-body"/>
   475 +        </panelview>
   442 +        </panelview>
   476 +      </photonpanelmultiview>
   443 +      </photonpanelmultiview>
       
   444 +    </panel>
       
   445 +    <panel id="pageActionFeedback"
       
   446 +           role="alert"
       
   447 +           type="arrow"
       
   448 +           hidden="true"
       
   449 +           flip="slide"
       
   450 +           position="bottomcenter topright"
       
   451 +           tabspecific="true"
       
   452 +           noautofocus="true"
       
   453 +           copyURLFeedback="&copyURLFeedback.label;"
       
   454 +           sendToDeviceFeedback="&sendToDeviceFeedback.label;">
       
   455 +      <hbox id="pageActionFeedbackAnimatableBox">
       
   456 +        <image id="pageActionFeedbackAnimatableImage"/>
       
   457 +      </hbox>
       
   458 +      <label id="pageActionFeedbackMessage"/>
   477 +    </panel>
   459 +    </panel>
   478 +
   460 +
   479 +    <menupopup id="pageActionPanelContextMenu"
   461 +    <menupopup id="pageActionPanelContextMenu"
   480 +               onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);">
   462 +               onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);">
   481 +      <menuitem id="pageActionPanelContextMenu-toggleUrlbar"
   463 +      <menuitem id="pageActionPanelContextMenu-toggleUrlbar"
   482 +                add-label="&pageAction.addToUrlbar.label;"
   464 +                add-label="&pageAction.addToUrlbar.label;"
   483 +                remove-label="&pageAction.removeFromUrlbar.label;"
   465 +                remove-label="&pageAction.removeFromUrlbar.label;"
   484 +                label="&pageAction.addToUrlbar.label;"
   466 +                label="&pageAction.addToUrlbar.label;"
   485 +                oncommand="BrowserPageActions.toggleShownInUrlbarForContextAction();"/>
   467 +                oncommand="BrowserPageActions.toggleShownInUrlbarForContextAction();"/>
   486 +    </menupopup>
   468 +    </menupopup>
   487 +#endif
       
   488 +
   469 +
   489 +    <!-- Bookmarks and history tooltip -->
   470 +    <!-- Bookmarks and history tooltip -->
   490 +    <tooltip id="bhTooltip"/>
   471 +    <tooltip id="bhTooltip"/>
   491 +
   472 +
   492 +    <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
   473 +    <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
   507 +#else
   488 +#else
   508 +      <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
   489 +      <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
   509 +#endif
   490 +#endif
   510 +    </tooltip>
   491 +    </tooltip>
   511 +
   492 +
   512 +    <tooltip id="share-button-tooltip" onpopupshowing="SocialShare.createTooltip(event);">
       
   513 +      <label class="tooltip-label"/>
       
   514 +      <label class="tooltip-label"/>
       
   515 +    </tooltip>
       
   516 +
       
   517 +#include popup-notifications.inc
   493 +#include popup-notifications.inc
   518 +
   494 +
   519 +#include ../../components/customizableui/content/panelUI.inc.xul
   495 +#include ../../components/customizableui/content/panelUI.inc.xul
   520 +#include ../../components/controlcenter/content/panel.inc.xul
   496 +#include ../../components/controlcenter/content/panel.inc.xul
   521 +
   497 +
   522 +    <hbox id="downloads-animation-container" mousethrough="always">
   498 +    <hbox id="downloads-animation-container" mousethrough="always">
   523 +      <vbox id="downloads-notification-anchor">
   499 +      <vbox id="downloads-notification-anchor" hidden="true">
   524 +        <vbox id="downloads-indicator-notification"/>
   500 +        <vbox id="downloads-indicator-notification"/>
   525 +      </vbox>
   501 +      </vbox>
   526 +    </hbox>
   502 +    </hbox>
   527 +
   503 +
   528 +    <hbox id="bookmarked-notification-container" mousethrough="always">
   504 +    <hbox id="bookmarked-notification-container" mousethrough="always">
   602 +#ifdef CAN_DRAW_IN_TITLEBAR
   578 +#ifdef CAN_DRAW_IN_TITLEBAR
   603 +<vbox id="titlebar">
   579 +<vbox id="titlebar">
   604 +  <hbox id="titlebar-content">
   580 +  <hbox id="titlebar-content">
   605 +    <spacer id="titlebar-spacer" flex="1"/>
   581 +    <spacer id="titlebar-spacer" flex="1"/>
   606 +    <hbox id="titlebar-buttonbox-container">
   582 +    <hbox id="titlebar-buttonbox-container">
   607 +#ifdef XP_WIN
       
   608 +      <hbox id="private-browsing-indicator-titlebar">
       
   609 +        <hbox class="private-browsing-indicator"/>
       
   610 +      </hbox>
       
   611 +#endif
       
   612 +      <hbox id="titlebar-buttonbox">
   583 +      <hbox id="titlebar-buttonbox">
   613 +        <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
   584 +        <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
   614 +        <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
   585 +        <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
   615 +        <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
   586 +        <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
   616 +      </hbox>
   587 +      </hbox>
   617 +    </hbox>
   588 +    </hbox>
   618 +#ifdef XP_MACOSX
   589 +#ifdef XP_MACOSX
   619 +    <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary
   590 +    <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary
   620 +         buttonbox from reversing order in RTL by forcing an LTR direction. -->
   591 +         buttonbox from reversing order in RTL by forcing an LTR direction. -->
   621 +    <hbox id="titlebar-secondary-buttonbox" dir="ltr">
   592 +    <hbox id="titlebar-secondary-buttonbox" dir="ltr">
       
   593 +      <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" aria-live="polite"/>
   622 +      <hbox class="private-browsing-indicator"/>
   594 +      <hbox class="private-browsing-indicator"/>
   623 +      <hbox id="titlebar-fullscreen-button"/>
   595 +      <hbox id="titlebar-fullscreen-button"/>
   624 +    </hbox>
   596 +    </hbox>
   625 +#endif
   597 +#endif
   626 +  </hbox>
   598 +  </hbox>
   647 +      </toolbaritem>
   619 +      </toolbaritem>
   648 +
   620 +
   649 +#ifdef CAN_DRAW_IN_TITLEBAR
   621 +#ifdef CAN_DRAW_IN_TITLEBAR
   650 +#ifndef XP_MACOSX
   622 +#ifndef XP_MACOSX
   651 +      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"
   623 +      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"
   652 +            id="titlebar-placeholder-on-menubar-for-caption-buttons" persist="width"
   624 +            persist="width"
   653 +            skipintoolbarset="true"/>
   625 +            skipintoolbarset="true"/>
   654 +#endif
   626 +#endif
   655 +#endif
   627 +#endif
   656 +    </toolbar>
   628 +    </toolbar>
   657 +
   629 +
   662 +             iconsize="small"
   634 +             iconsize="small"
   663 +             aria-label="&tabsToolbar.label;"
   635 +             aria-label="&tabsToolbar.label;"
   664 +             context="toolbar-context-menu"
   636 +             context="toolbar-context-menu"
   665 +             collapsed="true">
   637 +             collapsed="true">
   666 +
   638 +
   667 +#if defined(MOZ_WIDGET_GTK)
   639 +#ifdef CAN_DRAW_IN_TITLEBAR
   668 +      <hbox id="private-browsing-indicator"
   640 +      <hbox class="titlebar-placeholder" type="pre-tabs"
   669 +            skipintoolbarset="true"/>
   641 +            skipintoolbarset="true"/>
   670 +#endif
   642 +#endif
   671 +
   643 +
   672 +      <tabs id="tabbrowser-tabs"
   644 +      <tabs id="tabbrowser-tabs"
   673 +            class="tabbrowser-tabs"
   645 +            class="tabbrowser-tabs"
   711 +          </menu>
   683 +          </menu>
   712 +          <menuseparator id="alltabs-popup-separator-2"/>
   684 +          <menuseparator id="alltabs-popup-separator-2"/>
   713 +        </menupopup>
   685 +        </menupopup>
   714 +      </toolbarbutton>
   686 +      </toolbarbutton>
   715 +
   687 +
   716 +#if !defined(MOZ_WIDGET_GTK)
   688 +#ifdef CAN_DRAW_IN_TITLEBAR
   717 +      <hbox class="private-browsing-indicator" skipintoolbarset="true"/>
   689 +      <hbox class="titlebar-placeholder" type="post-tabs"
   718 +#endif
   690 +            ordinal="1000"
       
   691 +            skipintoolbarset="true"/>
       
   692 +#endif
       
   693 +
       
   694 +      <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
       
   695 +              ordinal="1000"
       
   696 +              aria-live="polite" skipintoolbarset="true"/>
       
   697 +      <hbox class="private-browsing-indicator" skipintoolbarset="true"
       
   698 +            ordinal="1000"/>
   719 +#ifdef CAN_DRAW_IN_TITLEBAR
   699 +#ifdef CAN_DRAW_IN_TITLEBAR
   720 +      <hbox class="titlebar-placeholder" type="caption-buttons"
   700 +      <hbox class="titlebar-placeholder" type="caption-buttons"
   721 +            id="titlebar-placeholder-on-TabsToolbar-for-captions-buttons" persist="width"
   701 +            persist="width"
   722 +#ifndef XP_MACOSX
   702 +#ifndef XP_MACOSX
   723 +            ordinal="1000"
   703 +            ordinal="1000"
   724 +#endif
   704 +#endif
   725 +            skipintoolbarset="true"/>
   705 +            skipintoolbarset="true"/>
   726 +
   706 +
   727 +#ifdef XP_MACOSX
   707 +#ifdef XP_MACOSX
   728 +      <hbox class="titlebar-placeholder" type="fullscreen-button"
   708 +      <hbox class="titlebar-placeholder" type="fullscreen-button"
   729 +            id="titlebar-placeholder-on-TabsToolbar-for-fullscreen-button" persist="width"
   709 +            persist="width"
   730 +            skipintoolbarset="true"/>
   710 +            skipintoolbarset="true"/>
   731 +#endif
   711 +#endif
   732 +#endif
   712 +#endif
   733 +    </toolbar>
   713 +    </toolbar>
   734 +
   714 +
   742 +             overflowtarget="widget-overflow-list"
   722 +             overflowtarget="widget-overflow-list"
   743 +             overflowpanel="widget-overflow"
   723 +             overflowpanel="widget-overflow"
   744 +             context="toolbar-context-menu">
   724 +             context="toolbar-context-menu">
   745 +
   725 +
   746 +      <hbox id="nav-bar-customization-target" flex="1">
   726 +      <hbox id="nav-bar-customization-target" flex="1">
       
   727 +        <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   728 +                       label="&backCmd.label;"
       
   729 +                       removable="false" overflows="false"
       
   730 +                       keepbroadcastattributeswhencustomizing="true"
       
   731 +                       command="Browser:BackOrBackDuplicate"
       
   732 +                       onclick="checkForMiddleClick(this, event);"
       
   733 +                       tooltip="back-button-tooltip"
       
   734 +                       context="backForwardMenu"/>
       
   735 +        <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   736 +                       label="&forwardCmd.label;"
       
   737 +                       removable="false" overflows="false"
       
   738 +                       keepbroadcastattributeswhencustomizing="true"
       
   739 +                       command="Browser:ForwardOrForwardDuplicate"
       
   740 +                       onclick="checkForMiddleClick(this, event);"
       
   741 +                       tooltip="forward-button-tooltip"
       
   742 +                       context="backForwardMenu"/>
       
   743 +        <toolbaritem id="stop-reload-button" class="chromeclass-toolbar-additional"
       
   744 +                     title="&reloadCmd.label;"
       
   745 +                     removable="true" overflows="false">
       
   746 +          <toolbarbutton id="reload-button" class="toolbarbutton-1"
       
   747 +                         label="&reloadCmd.label;"
       
   748 +                         command="Browser:ReloadOrDuplicate"
       
   749 +                         onclick="checkForMiddleClick(this, event);"
       
   750 +                         tooltip="dynamic-shortcut-tooltip">
       
   751 +            <box class="toolbarbutton-animatable-box">
       
   752 +              <image class="toolbarbutton-animatable-image"/>
       
   753 +            </box>
       
   754 +          </toolbarbutton>
       
   755 +          <toolbarbutton id="stop-button" class="toolbarbutton-1"
       
   756 +                         label="&stopCmd.label;"
       
   757 +                         command="Browser:Stop"
       
   758 +                         tooltip="dynamic-shortcut-tooltip">
       
   759 +            <box class="toolbarbutton-animatable-box">
       
   760 +              <image class="toolbarbutton-animatable-image"/>
       
   761 +            </box>
       
   762 +          </toolbarbutton>
       
   763 +        </toolbaritem>
       
   764 +        <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   765 +                       removable="true"
       
   766 +                       label="&homeButton.label;"
       
   767 +                       ondragover="homeButtonObserver.onDragOver(event)"
       
   768 +                       ondragenter="homeButtonObserver.onDragOver(event)"
       
   769 +                       ondrop="homeButtonObserver.onDrop(event)"
       
   770 +                       ondragexit="homeButtonObserver.onDragExit(event)"
       
   771 +                       key="goHome"
       
   772 +                       onclick="BrowserGoHome(event);"
       
   773 +                       cui-areatype="toolbar"
       
   774 +                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
       
   775 +        <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
   747 +        <toolbaritem id="urlbar-container" flex="400" persist="width"
   776 +        <toolbaritem id="urlbar-container" flex="400" persist="width"
   748 +                     removable="false"
   777 +                     removable="false"
   749 +                     class="chromeclass-location" overflows="false">
   778 +                     class="chromeclass-location" overflows="false">
   750 +          <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   751 +                         removable="false" overflows="false"
       
   752 +                         label="&backCmd.label;"
       
   753 +                         command="Browser:BackOrBackDuplicate"
       
   754 +                         onclick="checkForMiddleClick(this, event);"
       
   755 +                         tooltip="back-button-tooltip"
       
   756 +                         context="backForwardMenu"/>
       
   757 +#ifdef MOZ_PHOTON_THEME
       
   758 +          <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   759 +                         removable="false" overflows="false"
       
   760 +                         label="&forwardCmd.label;"
       
   761 +                         command="Browser:ForwardOrForwardDuplicate"
       
   762 +                         onclick="checkForMiddleClick(this, event);"
       
   763 +                         tooltip="forward-button-tooltip"
       
   764 +                         context="backForwardMenu"/>
       
   765 +          <toolbaritem id="stop-reload-button"
       
   766 +                       removable="false" overflows="false"
       
   767 +                       class="chromeclass-toolbar-additional">
       
   768 +            <toolbarbutton id="reload-button"
       
   769 +                           class="toolbarbutton-1"
       
   770 +                           command="Browser:ReloadOrDuplicate"
       
   771 +                           onclick="checkForMiddleClick(this, event);"
       
   772 +                           tooltip="dynamic-shortcut-tooltip">
       
   773 +              <box class="toolbarbutton-animatable-box">
       
   774 +                <image class="toolbarbutton-animatable-image"/>
       
   775 +              </box>
       
   776 +            </toolbarbutton>
       
   777 +            <toolbarbutton id="stop-button"
       
   778 +                           class="toolbarbutton-1"
       
   779 +                           command="Browser:Stop"
       
   780 +                           tooltip="dynamic-shortcut-tooltip">
       
   781 +              <box class="toolbarbutton-animatable-box">
       
   782 +                <image class="toolbarbutton-animatable-image"/>
       
   783 +              </box>
       
   784 +            </toolbarbutton>
       
   785 +          </toolbaritem>
       
   786 +#endif
       
   787 +          <hbox id="urlbar-wrapper" flex="1">
       
   788 +#ifndef MOZ_PHOTON_THEME
       
   789 +            <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   790 +                           label="&forwardCmd.label;"
       
   791 +                           command="Browser:ForwardOrForwardDuplicate"
       
   792 +                           onclick="checkForMiddleClick(this, event);"
       
   793 +                           tooltip="forward-button-tooltip"
       
   794 +                           context="backForwardMenu"/>
       
   795 +#endif
       
   796 +            <textbox id="urlbar" flex="1"
   779 +            <textbox id="urlbar" flex="1"
   797 +                     placeholder="&urlbar.placeholder2;"
   780 +                     placeholder="&urlbar.placeholder2;"
   798 +                     type="autocomplete"
   781 +                     type="autocomplete"
   799 +                     autocompletesearch="unifiedcomplete"
   782 +                     autocompletesearch="unifiedcomplete"
   800 +                     autocompletesearchparam="enable-actions"
   783 +                     autocompletesearchparam="enable-actions"
   888 +              </box>
   871 +              </box>
   889 +              <box id="urlbar-display-box" align="center">
   872 +              <box id="urlbar-display-box" align="center">
   890 +                <label id="switchtab" class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
   873 +                <label id="switchtab" class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
   891 +                <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/>
   874 +                <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/>
   892 +              </box>
   875 +              </box>
   893 +              <hbox id="urlbar-icons">
   876 +              <hbox id="page-action-buttons">
       
   877 +                <hbox id="userContext-icons" hidden="true">
       
   878 +                  <label id="userContext-label"/>
       
   879 +                  <image id="userContext-indicator"/>
       
   880 +                </hbox>
   894 +                <image id="page-report-button"
   881 +                <image id="page-report-button"
   895 +                       class="urlbar-icon"
   882 +                       class="urlbar-icon urlbar-page-action"
       
   883 +                       role="button"
   896 +                       hidden="true"
   884 +                       hidden="true"
   897 +                       tooltiptext="&pageReportIcon.tooltip;"
   885 +                       tooltiptext="&pageReportIcon.tooltip;"
   898 +                       onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>
   886 +                       onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>
   899 +                <image id="reader-mode-button"
   887 +                <image id="reader-mode-button"
   900 +                       class="urlbar-icon"
   888 +                       class="urlbar-icon urlbar-page-action"
       
   889 +                       role="button"
   901 +                       hidden="true"
   890 +                       hidden="true"
   902 +                       onclick="ReaderParent.buttonClick(event);"/>
   891 +                       onclick="ReaderParent.buttonClick(event);"/>
   903 +                <toolbarbutton id="urlbar-zoom-button"
   892 +                <toolbarbutton id="urlbar-zoom-button"
   904 +                       onclick="FullZoom.reset();"
   893 +                       onclick="FullZoom.reset();"
   905 +                       tooltip="dynamic-shortcut-tooltip"
   894 +                       tooltip="dynamic-shortcut-tooltip"
   906 +                       hidden="true"/>
   895 +                       hidden="true"/>
   907 +#ifdef MOZ_PHOTON_THEME
   896 +                <box id="pageActionSeparator" class="urlbar-page-action"/>
   908 +                <image id="pageActionButton"
   897 +                <image id="pageActionButton"
   909 +                       class="urlbar-icon"
   898 +                       class="urlbar-icon urlbar-page-action"
       
   899 +                       role="button"
   910 +                       tooltiptext="&pageActionButton.tooltip;"
   900 +                       tooltiptext="&pageActionButton.tooltip;"
   911 +                       onclick="BrowserPageActions.mainButtonClicked(event);"/>
   901 +                       onmousedown="BrowserPageActions.mainButtonClicked(event);"/>
   912 +                <hbox id="star-button-box" hidden="true">
   902 +                <hbox id="star-button-box"
       
   903 +                      hidden="true"
       
   904 +                      class="urlbar-icon-wrapper urlbar-page-action"
       
   905 +                      context="pageActionPanelContextMenu"
       
   906 +                      oncontextmenu="BrowserPageActions.onContextMenu(event);"
       
   907 +                      onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);">
   913 +                  <image id="star-button"
   908 +                  <image id="star-button"
   914 +                         class="urlbar-icon"
   909 +                         class="urlbar-icon"
   915 +                         onclick="BookmarkingUI.onStarCommand(event);">
   910 +                         role="button"
   916 +                    <observes element="bookmarkThisPageBroadcaster" attribute="starred"/>
   911 +                         observes="bookmarkThisPageBroadcaster"/>
   917 +                    <observes element="bookmarkThisPageBroadcaster" attribute="tooltiptext"/>
       
   918 +                  </image>
       
   919 +                  <hbox id="star-button-animatable-box">
   912 +                  <hbox id="star-button-animatable-box">
   920 +                    <image id="star-button-animatable-image"
   913 +                    <image id="star-button-animatable-image"
   921 +                           onclick="BookmarkingUI.onStarCommand(event);"/>
   914 +                           role="presentation"
       
   915 +                           observes="bookmarkThisPageBroadcaster"/>
   922 +                  </hbox>
   916 +                  </hbox>
   923 +                </hbox>
   917 +                </hbox>
   924 +#endif
       
   925 +              </hbox>
   918 +              </hbox>
   926 +              <hbox id="userContext-icons" hidden="true">
       
   927 +                <label id="userContext-label"/>
       
   928 +                <image id="userContext-indicator"/>
       
   929 +              </hbox>
       
   930 +#ifndef MOZ_PHOTON_THEME
       
   931 +              <toolbarbutton id="urlbar-go-button"
       
   932 +                             class="chromeclass-toolbar-additional"
       
   933 +                             onclick="gURLBar.handleCommand(event);"
       
   934 +                             tooltiptext="&goEndCap.tooltip;"/>
       
   935 +              <toolbarbutton id="reload-button"
       
   936 +                             class="chromeclass-toolbar-additional"
       
   937 +                             command="Browser:ReloadOrDuplicate"
       
   938 +                             onclick="checkForMiddleClick(this, event);"
       
   939 +                             tooltip="dynamic-shortcut-tooltip"/>
       
   940 +              <toolbarbutton id="stop-button"
       
   941 +                             class="chromeclass-toolbar-additional"
       
   942 +                             command="Browser:Stop"
       
   943 +                             tooltip="dynamic-shortcut-tooltip"/>
       
   944 +#endif
       
   945 +            </textbox>
   919 +            </textbox>
   946 +          </hbox>
       
   947 +        </toolbaritem>
   920 +        </toolbaritem>
   948 +
   921 +
   949 +        <toolbaritem id="search-container" title="&searchItem.title;"
   922 +        <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
   950 +                     align="center" class="chromeclass-toolbar-additional panel-wide-item"
       
   951 +                     cui-areatype="toolbar"
       
   952 +                     flex="100" persist="width" removable="true">
       
   953 +          <searchbar id="searchbar" flex="1"/>
       
   954 +        </toolbaritem>
       
   955 +
       
   956 +        <toolbarbutton id="bookmarks-menu-button"
       
   957 +                       class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   958 +                       removable="true"
       
   959 +#ifdef MOZ_PHOTON_THEME
       
   960 +                       type="menu"
       
   961 +#else
       
   962 +                       type="menu-button"
       
   963 +#endif
       
   964 +                       label="&bookmarksMenuButton.label;"
       
   965 +                       tooltip="dynamic-shortcut-tooltip"
       
   966 +                       anchor="dropmarker"
       
   967 +                       ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
       
   968 +                       ondragover="PlacesMenuDNDHandler.onDragOver(event);"
       
   969 +                       ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
       
   970 +                       ondrop="PlacesMenuDNDHandler.onDrop(event);"
       
   971 +                       cui-areatype="toolbar"
       
   972 +                       oncommand="BookmarkingUI.onCommand(event);">
       
   973 +          <observes element="bookmarkThisPageBroadcaster" attribute="starred"/>
       
   974 +          <observes element="bookmarkThisPageBroadcaster" attribute="buttontooltiptext"/>
       
   975 +          <menupopup id="BMB_bookmarksPopup"
       
   976 +                     class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView"
       
   977 +                     placespopup="true"
       
   978 +                     context="placesContext"
       
   979 +                     openInTabs="children"
       
   980 +                     oncommand="BookmarksEventHandler.onCommand(event);"
       
   981 +                     onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
       
   982 +                     onpopupshowing="BookmarkingUI.onPopupShowing(event);
       
   983 +                                     BookmarkingUI.attachPlacesView(event, this);"
       
   984 +                     tooltip="bhTooltip" popupsinherittooltip="true">
       
   985 +            <menuitem id="BMB_viewBookmarksSidebar"
       
   986 +                      class="subviewbutton"
       
   987 +                      label="&viewBookmarksSidebar2.label;"
       
   988 +                      type="checkbox"
       
   989 +                      oncommand="SidebarUI.toggle('viewBookmarksSidebar');">
       
   990 +              <observes element="viewBookmarksSidebar" attribute="checked"/>
       
   991 +            </menuitem>
       
   992 +            <!-- NB: temporary solution for bug 985024, this should go away soon. -->
       
   993 +            <menuitem id="BMB_bookmarksShowAllTop"
       
   994 +                      class="menuitem-iconic subviewbutton"
       
   995 +                      label="&showAllBookmarks2.label;"
       
   996 +                      command="Browser:ShowAllBookmarks"
       
   997 +                      key="manBookmarkKb"/>
       
   998 +            <menuseparator/>
       
   999 +            <menuitem label="&recentBookmarks.label;"
       
  1000 +                      id="BMB_recentBookmarks"
       
  1001 +                      disabled="true"
       
  1002 +                      class="menuitem-iconic subviewbutton"/>
       
  1003 +            <menuseparator/>
       
  1004 +            <menu id="BMB_bookmarksToolbar"
       
  1005 +                  class="menu-iconic bookmark-item subviewbutton"
       
  1006 +                  label="&personalbarCmd.label;"
       
  1007 +                  container="true">
       
  1008 +              <menupopup id="BMB_bookmarksToolbarPopup"
       
  1009 +                         placespopup="true"
       
  1010 +                         context="placesContext"
       
  1011 +                         onpopupshowing="if (!this.parentNode._placesView)
       
  1012 +                                           new PlacesMenu(event, 'place:folder=TOOLBAR',
       
  1013 +                                                          PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);">
       
  1014 +                <menuitem id="BMB_viewBookmarksToolbar"
       
  1015 +                          placesanonid="view-toolbar"
       
  1016 +                          toolbarId="PersonalToolbar"
       
  1017 +                          type="checkbox"
       
  1018 +                          oncommand="onViewToolbarCommand(event)"
       
  1019 +                          label="&viewBookmarksToolbar.label;"/>
       
  1020 +                <menuseparator/>
       
  1021 +                <!-- Bookmarks toolbar items -->
       
  1022 +              </menupopup>
       
  1023 +            </menu>
       
  1024 +            <menu id="BMB_unsortedBookmarks"
       
  1025 +                  class="menu-iconic bookmark-item subviewbutton"
       
  1026 +                  label="&bookmarksMenuButton.other.label;"
       
  1027 +                  container="true">
       
  1028 +              <menupopup id="BMB_unsortedBookmarksPopup"
       
  1029 +                         placespopup="true"
       
  1030 +                         context="placesContext"
       
  1031 +                         onpopupshowing="if (!this.parentNode._placesView)
       
  1032 +                                           new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
       
  1033 +                                                          PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
       
  1034 +            </menu>
       
  1035 +            <menu id="BMB_mobileBookmarks"
       
  1036 +                  class="menu-iconic bookmark-item subviewbutton"
       
  1037 +                  label="&bookmarksMenuButton.mobile.label;"
       
  1038 +                  hidden="true"
       
  1039 +                  container="true">
       
  1040 +              <menupopup id="BMB_mobileBookmarksPopup"
       
  1041 +                         placespopup="true"
       
  1042 +                         context="placesContext"
       
  1043 +                         onpopupshowing="if (!this.parentNode._placesView)
       
  1044 +                                           new PlacesMenu(event, 'place:folder=MOBILE_BOOKMARKS',
       
  1045 +                                                          PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
       
  1046 +            </menu>
       
  1047 +
       
  1048 +            <menuseparator/>
       
  1049 +            <!-- Bookmarks menu items will go here -->
       
  1050 +            <menuitem id="BMB_bookmarksShowAll"
       
  1051 +                      class="subviewbutton panel-subview-footer"
       
  1052 +                      label="&showAllBookmarks2.label;"
       
  1053 +                      command="Browser:ShowAllBookmarks"
       
  1054 +                      key="manBookmarkKb"/>
       
  1055 +          </menupopup>
       
  1056 +        </toolbarbutton>
       
  1057 +
   923 +
  1058 +        <!-- This is a placeholder for the Downloads Indicator.  It is visible
   924 +        <!-- This is a placeholder for the Downloads Indicator.  It is visible
  1059 +             during the customization of the toolbar, in the palette, and before
   925 +             during the customization of the toolbar, in the palette, and before
  1060 +             the Downloads Indicator overlay is loaded. -->
   926 +             the Downloads Indicator overlay is loaded. -->
  1061 +        <toolbarbutton id="downloads-button"
   927 +        <toolbarbutton id="downloads-button"
  1062 +                       class="toolbarbutton-1 chromeclass-toolbar-additional badged-button"
   928 +                       class="toolbarbutton-1 chromeclass-toolbar-additional badged-button"
  1063 +                       key="key_openDownloads"
   929 +                       key="key_openDownloads"
  1064 +                       oncommand="DownloadsIndicatorView.onCommand(event);"
   930 +                       onmousedown="DownloadsIndicatorView.onCommand(event);"
  1065 +                       ondrop="DownloadsIndicatorView.onDrop(event);"
   931 +                       ondrop="DownloadsIndicatorView.onDrop(event);"
  1066 +                       ondragover="DownloadsIndicatorView.onDragOver(event);"
   932 +                       ondragover="DownloadsIndicatorView.onDragOver(event);"
  1067 +                       ondragenter="DownloadsIndicatorView.onDragOver(event);"
   933 +                       ondragenter="DownloadsIndicatorView.onDragOver(event);"
  1068 +                       label="&downloads.label;"
   934 +                       label="&downloads.label;"
  1069 +                       removable="true"
   935 +                       removable="true"
       
   936 +                       overflows="false"
  1070 +                       cui-areatype="toolbar"
   937 +                       cui-areatype="toolbar"
       
   938 +                       hidden="true"
  1071 +                       tooltip="dynamic-shortcut-tooltip"/>
   939 +                       tooltip="dynamic-shortcut-tooltip"/>
  1072 +
   940 +
  1073 +        <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
   941 +        <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
  1074 +                       removable="true"
   942 +                       removable="true"
  1075 +                       label="&homeButton.label;"
   943 +                       onmousedown="PanelUI.showSubView('appMenu-libraryView', this, null, event);"
  1076 +                       ondragover="homeButtonObserver.onDragOver(event)"
   944 +                       closemenu="none"
  1077 +                       ondragenter="homeButtonObserver.onDragOver(event)"
       
  1078 +                       ondrop="homeButtonObserver.onDrop(event)"
       
  1079 +                       ondragexit="homeButtonObserver.onDragExit(event)"
       
  1080 +                       key="goHome"
       
  1081 +                       onclick="BrowserGoHome(event);"
       
  1082 +                       cui-areatype="toolbar"
   945 +                       cui-areatype="toolbar"
  1083 +                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
   946 +                       tooltiptext="&libraryButton.tooltip;"
       
   947 +                       label="&places.library.title;"/>
       
   948 +
  1084 +      </hbox>
   949 +      </hbox>
  1085 +
   950 +
  1086 +      <toolbarbutton id="nav-bar-overflow-button"
   951 +      <toolbarbutton id="nav-bar-overflow-button"
  1087 +                     class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
   952 +                     class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
  1088 +                     skipintoolbarset="true"
   953 +                     skipintoolbarset="true"
  1089 +                     tooltiptext="&navbarOverflow.label;">
   954 +                     tooltiptext="&navbarOverflow.label;">
  1090 +#ifdef MOZ_PHOTON_ANIMATIONS
       
  1091 +        <box class="toolbarbutton-animatable-box">
   955 +        <box class="toolbarbutton-animatable-box">
  1092 +          <image class="toolbarbutton-animatable-image"/>
   956 +          <image class="toolbarbutton-animatable-image"/>
  1093 +        </box>
   957 +        </box>
  1094 +#endif
       
  1095 +      </toolbarbutton>
   958 +      </toolbarbutton>
  1096 +
   959 +
  1097 +      <toolbaritem id="PanelUI-button"
   960 +      <toolbaritem id="PanelUI-button"
  1098 +                   class="chromeclass-toolbar-additional"
       
  1099 +                   removable="false">
   961 +                   removable="false">
  1100 +        <toolbarbutton id="PanelUI-menu-button"
   962 +        <toolbarbutton id="PanelUI-menu-button"
  1101 +                       class="toolbarbutton-1 badged-button"
   963 +                       class="toolbarbutton-1 badged-button"
  1102 +                       consumeanchor="PanelUI-button"
   964 +                       consumeanchor="PanelUI-button"
  1103 +                       label="&brandShortName;"
   965 +                       label="&brandShortName;"
  1137 +      <toolbaritem id="personal-bookmarks"
   999 +      <toolbaritem id="personal-bookmarks"
  1138 +                   title="&bookmarksToolbarItem.label;"
  1000 +                   title="&bookmarksToolbarItem.label;"
  1139 +                   cui-areatype="toolbar"
  1001 +                   cui-areatype="toolbar"
  1140 +                   removable="true">
  1002 +                   removable="true">
  1141 +        <toolbarbutton id="bookmarks-toolbar-placeholder"
  1003 +        <toolbarbutton id="bookmarks-toolbar-placeholder"
       
  1004 +                       class="bookmark-item"
       
  1005 +                       label="&bookmarksToolbarItem.label;"/>
       
  1006 +        <toolbarbutton id="bookmarks-toolbar-button"
  1142 +                       class="toolbarbutton-1"
  1007 +                       class="toolbarbutton-1"
  1143 +                       mousethrough="never"
  1008 +                       flex="1"
  1144 +                       label="&bookmarksToolbarItem.label;"
  1009 +                       label="&bookmarksToolbarItem.label;"
  1145 +                       oncommand="PlacesToolbarHelper.onPlaceholderCommand();"/>
  1010 +                       oncommand="PlacesToolbarHelper.onPlaceholderCommand();"/>
  1146 +        <hbox flex="1"
  1011 +        <hbox flex="1"
  1147 +              id="PlacesToolbar"
  1012 +              id="PlacesToolbar"
  1148 +              context="placesContext"
  1013 +              context="placesContext"
       
  1014 +              onmouseup="BookmarksEventHandler.onMouseUp(event);"
  1149 +              onclick="BookmarksEventHandler.onClick(event, this._placesView);"
  1015 +              onclick="BookmarksEventHandler.onClick(event, this._placesView);"
  1150 +              oncommand="BookmarksEventHandler.onCommand(event);"
  1016 +              oncommand="BookmarksEventHandler.onCommand(event);"
  1151 +              tooltip="bhTooltip"
  1017 +              tooltip="bhTooltip"
  1152 +              popupsinherittooltip="true">
  1018 +              popupsinherittooltip="true">
  1153 +          <hbox flex="1">
  1019 +          <hbox flex="1">
  1159 +            <scrollbox orient="horizontal"
  1025 +            <scrollbox orient="horizontal"
  1160 +                       id="PlacesToolbarItems"
  1026 +                       id="PlacesToolbarItems"
  1161 +                       flex="1"/>
  1027 +                       flex="1"/>
  1162 +            <toolbarbutton type="menu"
  1028 +            <toolbarbutton type="menu"
  1163 +                           id="PlacesChevron"
  1029 +                           id="PlacesChevron"
  1164 +                           class="chevron"
  1030 +                           class="toolbarbutton-1"
  1165 +                           mousethrough="never"
  1031 +                           mousethrough="never"
  1166 +                           collapsed="true"
  1032 +                           collapsed="true"
  1167 +                           tooltiptext="&bookmarksToolbarChevron.tooltip;"
  1033 +                           tooltiptext="&bookmarksToolbarChevron.tooltip;"
  1168 +                           onpopupshowing="document.getElementById('PlacesToolbar')
  1034 +                           onpopupshowing="document.getElementById('PlacesToolbar')
  1169 +                                                   ._placesView._onChevronPopupShowing(event);">
  1035 +                                                   ._placesView._onChevronPopupShowing(event);">
  1175 +          </hbox>
  1041 +          </hbox>
  1176 +        </hbox>
  1042 +        </hbox>
  1177 +      </toolbaritem>
  1043 +      </toolbaritem>
  1178 +    </toolbar>
  1044 +    </toolbar>
  1179 +
  1045 +
  1180 +    <!-- This is a shim which will go away ASAP. See bug 749804 for details -->
       
  1181 +    <toolbar id="addon-bar" toolbar-delegate="nav-bar" mode="icons" iconsize="small"
       
  1182 +             customizable="true">
       
  1183 +      <hbox id="addonbar-closebutton"/>
       
  1184 +      <statusbar id="status-bar"/>
       
  1185 +    </toolbar>
       
  1186 +
       
  1187 +    <toolbarpalette id="BrowserToolbarPalette">
  1046 +    <toolbarpalette id="BrowserToolbarPalette">
  1188 +
       
  1189 +# Update primaryToolbarButtons in browser/themes/shared/browser.inc when adding
       
  1190 +# or removing default items with the toolbarbutton-1 class.
       
  1191 +
  1047 +
  1192 +      <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
  1048 +      <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
  1193 +#ifdef XP_MACOSX
  1049 +#ifdef XP_MACOSX
  1194 +                     command="cmd_print"
  1050 +                     command="cmd_print"
  1195 +                     tooltip="dynamic-shortcut-tooltip"
  1051 +                     tooltip="dynamic-shortcut-tooltip"
  1212 +      <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
  1068 +      <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
  1213 +                     observes="View:FullScreen"
  1069 +                     observes="View:FullScreen"
  1214 +                     type="checkbox"
  1070 +                     type="checkbox"
  1215 +                     label="&fullScreenCmd.label;"
  1071 +                     label="&fullScreenCmd.label;"
  1216 +                     tooltip="dynamic-shortcut-tooltip"/>
  1072 +                     tooltip="dynamic-shortcut-tooltip"/>
  1217 +#ifdef MOZ_PHOTON_THEME
  1073 +
  1218 +      <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
  1074 +      <toolbarbutton id="bookmarks-menu-button"
  1219 +                     oncommand="PanelUI.showSubView('appMenu-libraryView', this, null, event);"
  1075 +                     class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
  1220 +                     closemenu="none"
  1076 +                     type="menu"
  1221 +                     label="&places.library.title;">
  1077 +                     label="&bookmarksMenuButton2.label;"
  1222 +        <box class="toolbarbutton-animatable-box">
  1078 +                     tooltip="dynamic-shortcut-tooltip"
  1223 +          <image class="toolbarbutton-animatable-image"/>
  1079 +                     anchor="dropmarker"
  1224 +        </box>
  1080 +                     ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
       
  1081 +                     ondragover="PlacesMenuDNDHandler.onDragOver(event);"
       
  1082 +                     ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
       
  1083 +                     ondrop="PlacesMenuDNDHandler.onDrop(event);"
       
  1084 +                     oncommand="BookmarkingUI.onCommand(event);">
       
  1085 +        <observes element="bookmarkThisPageBroadcaster" attribute="starred"/>
       
  1086 +        <observes element="bookmarkThisPageBroadcaster" attribute="buttontooltiptext"/>
       
  1087 +        <menupopup id="BMB_bookmarksPopup"
       
  1088 +                   class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView"
       
  1089 +                   placespopup="true"
       
  1090 +                   context="placesContext"
       
  1091 +                   openInTabs="children"
       
  1092 +                   onmouseup="BookmarksEventHandler.onMouseUp(event);"
       
  1093 +                   oncommand="BookmarksEventHandler.onCommand(event);"
       
  1094 +                   onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
       
  1095 +                   onpopupshowing="BookmarkingUI.onPopupShowing(event);
       
  1096 +                                   BookmarkingUI.attachPlacesView(event, this);"
       
  1097 +                   tooltip="bhTooltip" popupsinherittooltip="true">
       
  1098 +          <menuitem id="BMB_viewBookmarksSidebar"
       
  1099 +                    class="subviewbutton"
       
  1100 +                    label="&viewBookmarksSidebar2.label;"
       
  1101 +                    type="checkbox"
       
  1102 +                    oncommand="SidebarUI.toggle('viewBookmarksSidebar');">
       
  1103 +            <observes element="viewBookmarksSidebar" attribute="checked"/>
       
  1104 +          </menuitem>
       
  1105 +          <!-- NB: temporary solution for bug 985024, this should go away soon. -->
       
  1106 +          <menuitem id="BMB_bookmarksShowAllTop"
       
  1107 +                    class="menuitem-iconic subviewbutton"
       
  1108 +                    label="&showAllBookmarks2.label;"
       
  1109 +                    command="Browser:ShowAllBookmarks"
       
  1110 +                    key="manBookmarkKb"/>
       
  1111 +          <menuseparator/>
       
  1112 +          <menu id="BMB_bookmarksToolbar"
       
  1113 +                class="menu-iconic bookmark-item subviewbutton"
       
  1114 +                label="&personalbarCmd.label;"
       
  1115 +                container="true">
       
  1116 +            <menupopup id="BMB_bookmarksToolbarPopup"
       
  1117 +                       placespopup="true"
       
  1118 +                       context="placesContext"
       
  1119 +                       onpopupshowing="if (!this.parentNode._placesView)
       
  1120 +                                         new PlacesMenu(event, 'place:folder=TOOLBAR',
       
  1121 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);">
       
  1122 +              <menuitem id="BMB_viewBookmarksToolbar"
       
  1123 +                        placesanonid="view-toolbar"
       
  1124 +                        toolbarId="PersonalToolbar"
       
  1125 +                        type="checkbox"
       
  1126 +                        oncommand="onViewToolbarCommand(event)"
       
  1127 +                        label="&viewBookmarksToolbar.label;"/>
       
  1128 +              <menuseparator/>
       
  1129 +              <!-- Bookmarks toolbar items -->
       
  1130 +            </menupopup>
       
  1131 +          </menu>
       
  1132 +          <menu id="BMB_unsortedBookmarks"
       
  1133 +                class="menu-iconic bookmark-item subviewbutton"
       
  1134 +                label="&bookmarksMenuButton.other.label;"
       
  1135 +                container="true">
       
  1136 +            <menupopup id="BMB_unsortedBookmarksPopup"
       
  1137 +                       placespopup="true"
       
  1138 +                       context="placesContext"
       
  1139 +                       onpopupshowing="if (!this.parentNode._placesView)
       
  1140 +                                         new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
       
  1141 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
       
  1142 +          </menu>
       
  1143 +          <menu id="BMB_mobileBookmarks"
       
  1144 +                class="menu-iconic bookmark-item subviewbutton"
       
  1145 +                label="&bookmarksMenuButton.mobile.label;"
       
  1146 +                hidden="true"
       
  1147 +                container="true">
       
  1148 +            <menupopup id="BMB_mobileBookmarksPopup"
       
  1149 +                       placespopup="true"
       
  1150 +                       context="placesContext"
       
  1151 +                       onpopupshowing="if (!this.parentNode._placesView)
       
  1152 +                                         new PlacesMenu(event, 'place:folder=MOBILE_BOOKMARKS',
       
  1153 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
       
  1154 +          </menu>
       
  1155 +
       
  1156 +          <menuseparator/>
       
  1157 +          <!-- Bookmarks menu items will go here -->
       
  1158 +          <menuitem id="BMB_bookmarksShowAll"
       
  1159 +                    class="subviewbutton panel-subview-footer"
       
  1160 +                    label="&showAllBookmarks2.label;"
       
  1161 +                    command="Browser:ShowAllBookmarks"
       
  1162 +                    key="manBookmarkKb"/>
       
  1163 +        </menupopup>
  1225 +      </toolbarbutton>
  1164 +      </toolbarbutton>
  1226 +#endif
  1165 +
       
  1166 +      <toolbaritem id="search-container"
       
  1167 +                   class="chromeclass-toolbar-additional panel-wide-item"
       
  1168 +                   title="&searchItem.title;"
       
  1169 +                   align="center"
       
  1170 +                   flex="100"
       
  1171 +                   persist="width">
       
  1172 +        <searchbar id="searchbar" flex="1"/>
       
  1173 +      </toolbaritem>
  1227 +    </toolbarpalette>
  1174 +    </toolbarpalette>
       
  1175 +    <box id="library-animatable-box" class="toolbarbutton-animatable-box">
       
  1176 +      <image class="toolbarbutton-animatable-image"/>
       
  1177 +    </box>
  1228 +  </toolbox>
  1178 +  </toolbox>
  1229 +
  1179 +
  1230 +  <hbox id="fullscr-toggler" hidden="true"/>
  1180 +  <hbox id="fullscr-toggler" hidden="true"/>
  1231 +
  1181 +
  1232 +  <deck id="content-deck" flex="1">
  1182 +  <deck id="content-deck" flex="1">
  1243 +# To ensure the button label's intrinsic width doesn't expand the sidebar
  1193 +# To ensure the button label's intrinsic width doesn't expand the sidebar
  1244 +# if the label is long, the button needs flex=1.
  1194 +# if the label is long, the button needs flex=1.
  1245 +# To ensure the button doesn't expand unnecessarily for short labels, the
  1195 +# To ensure the button doesn't expand unnecessarily for short labels, the
  1246 +# spacer should significantly out-flex the button.
  1196 +# spacer should significantly out-flex the button.
  1247 +          <spacer flex="1000"/>
  1197 +          <spacer flex="1000"/>
  1248 +          <toolbarbutton id="sidebar-close" class="tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
  1198 +          <toolbarbutton id="sidebar-close" class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
  1249 +        </sidebarheader>
  1199 +        </sidebarheader>
  1250 +        <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" disablefullscreen="true"
  1200 +        <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" disablefullscreen="true"
  1251 +                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
  1201 +                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
  1252 +      </vbox>
  1202 +      </vbox>
  1253 +
  1203 +
  1298 +  </html:div>
  1248 +  </html:div>
  1299 +
  1249 +
  1300 +  <vbox id="browser-bottombox" layer="true">
  1250 +  <vbox id="browser-bottombox" layer="true">
  1301 +    <notificationbox id="global-notificationbox" notificationside="bottom"/>
  1251 +    <notificationbox id="global-notificationbox" notificationside="bottom"/>
  1302 +  </vbox>
  1252 +  </vbox>
  1303 +
       
  1304 +  <svg:svg height="0">
       
  1305 +#include tab-shape.inc.svg
       
  1306 +#ifndef MOZ_PHOTON_THEME
       
  1307 +    <svg:clipPath id="urlbar-back-button-clip-path">
       
  1308 +#ifndef XP_MACOSX
       
  1309 +      <svg:path d="M -9,-4 l 0,1 a 15 15 0 0,1 0,30 l 0,1 l 10000,0 l 0,-32 l -10000,0 z" />
       
  1310 +#else
       
  1311 +      <svg:path d="M -11,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/>
       
  1312 +#endif
       
  1313 +    </svg:clipPath>
       
  1314 +#ifdef XP_WIN
       
  1315 +    <svg:clipPath id="urlbar-back-button-clip-path-win10">
       
  1316 +      <svg:path d="M -6,-2 l 0,1 a 15 15 0 0,1 0,30 l 0,1 l 10000,0 l 0,-32 l -10000,0 z" />
       
  1317 +    </svg:clipPath>
       
  1318 +#endif
       
  1319 +#endif
       
  1320 +  </svg:svg>
       
  1321 +
  1253 +
  1322 +</vbox>
  1254 +</vbox>
  1323 +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
  1255 +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
  1324 +#     Introducing the iframe dynamically, as needed, was found to be better than
  1256 +#     Introducing the iframe dynamically, as needed, was found to be better than
  1325 +#     starting with an empty iframe here in browser.xul from a Ts standpoint.
  1257 +#     starting with an empty iframe here in browser.xul from a Ts standpoint.