firefox-kde.patch
changeset 716 cef565f1c325
parent 703 c4aab80e472f
child 718 6cb1ac7cd223
child 721 6f30563d969e
equal deleted inserted replaced
715:e1c226a4de34 716:cef565f1c325
     1 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
     1 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
     2 new file mode 100644
     2 new file mode 100644
     3 --- /dev/null
     3 --- /dev/null
     4 +++ b/browser/base/content/browser-kde.xul
     4 +++ b/browser/base/content/browser-kde.xul
     5 @@ -0,0 +1,1177 @@
     5 @@ -0,0 +1,1213 @@
     6 +#filter substitution
     6 +#filter substitution
     7 +<?xml version="1.0"?>
     7 +<?xml version="1.0"?>
     8 +# -*- Mode: HTML -*-
     8 +# -*- Mode: HTML -*-
     9 +#
     9 +#
    10 +# This Source Code Form is subject to the terms of the Mozilla Public
    10 +# This Source Code Form is subject to the terms of the Mozilla Public
    12 +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
    12 +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
    13 +
    13 +
    14 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
    14 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
    15 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
    15 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
    16 +<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
    16 +<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
       
    17 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?>
    17 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
    18 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
       
    19 +<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?>
    18 +
    20 +
    19 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
    21 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
    20 +<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
    22 +<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
    21 +<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
    23 +<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
    22 +
    24 +
    42 +        title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
    44 +        title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
    43 +        titlemodifier="&mainWindow.titlemodifier;"
    45 +        titlemodifier="&mainWindow.titlemodifier;"
    44 +        titlemodifier_normal="&mainWindow.titlemodifier;"
    46 +        titlemodifier_normal="&mainWindow.titlemodifier;"
    45 +        titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
    47 +        titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
    46 +#endif
    48 +#endif
       
    49 +#ifdef CAN_DRAW_IN_TITLEBAR
       
    50 +#ifdef XP_WIN
       
    51 +        chromemargin="0,2,2,2"
       
    52 +#else
       
    53 +        chromemargin="0,-1,-1,-1"
       
    54 +#endif
       
    55 +        tabsintitlebar="true"
       
    56 +#endif
    47 +        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
    57 +        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
    48 +        lightweightthemes="true"
    58 +        lightweightthemes="true"
    49 +        lightweightthemesfooter="browser-bottombox"
    59 +        lightweightthemesfooter="browser-bottombox"
    50 +        windowtype="navigator:browser"
    60 +        windowtype="navigator:browser"
    51 +        macanimationtype="document"
    61 +        macanimationtype="document"
    52 +        screenX="4" screenY="4"
    62 +        screenX="4" screenY="4"
    53 +        fullscreenbutton="true"
    63 +        fullscreenbutton="true"
       
    64 +        sizemode="normal"
    54 +        persist="screenX screenY width height sizemode">
    65 +        persist="screenX screenY width height sizemode">
    55 +
    66 +
    56 +# All JS files which are not content (only) dependent that browser.xul
    67 +# All JS files which are not content (only) dependent that browser.xul
    57 +# wishes to include *must* go into the global-scripts.inc file
    68 +# wishes to include *must* go into the global-scripts.inc file
    58 +# so that they can be shared by macBrowserOverlay.xul.
    69 +# so that they can be shared by macBrowserOverlay.xul.
   121 +    <menupopup id="backForwardMenu"
   132 +    <menupopup id="backForwardMenu"
   122 +               onpopupshowing="return FillHistoryMenu(event.target);"
   133 +               onpopupshowing="return FillHistoryMenu(event.target);"
   123 +               oncommand="gotoHistoryIndex(event); event.stopPropagation();"
   134 +               oncommand="gotoHistoryIndex(event); event.stopPropagation();"
   124 +               onclick="checkForMiddleClick(this, event);"/>
   135 +               onclick="checkForMiddleClick(this, event);"/>
   125 +    <tooltip id="aHTMLTooltip" page="true"/>
   136 +    <tooltip id="aHTMLTooltip" page="true"/>
       
   137 +    <tooltip id="remoteBrowserTooltip"/>
   126 +
   138 +
   127 +    <!-- for search and content formfill/pw manager -->
   139 +    <!-- for search and content formfill/pw manager -->
   128 +    <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
   140 +    <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
   129 +
   141 +
   130 +    <!-- for url bar autocomplete -->
   142 +    <!-- for url bar autocomplete -->
   190 +    <!-- UI tour experience -->
   202 +    <!-- UI tour experience -->
   191 +    <panel id="UITourTooltip"
   203 +    <panel id="UITourTooltip"
   192 +           type="arrow"
   204 +           type="arrow"
   193 +           hidden="true"
   205 +           hidden="true"
   194 +           noautofocus="true"
   206 +           noautofocus="true"
       
   207 +           noautohide="true"
   195 +           align="start"
   208 +           align="start"
   196 +           orient="vertical"
   209 +           orient="vertical"
   197 +           role="alert">
   210 +           role="alert">
   198 +      <label id="UITourTooltipTitle" flex="1"/>
   211 +     <vbox>
   199 +      <description id="UITourTooltipDescription" flex="1"/>
   212 +      <hbox pack="end">
       
   213 +        <toolbarbutton id="UITourTooltipClose" class="close-icon"
       
   214 +                       tooltiptext="&uiTour.infoPanel.close;"/>
       
   215 +      </hbox>
       
   216 +      <hbox id="UITourTooltipBody">
       
   217 +        <vbox id="UITourTooltipIconContainer">
       
   218 +          <image id="UITourTooltipIcon"/>
       
   219 +        </vbox>
       
   220 +        <vbox flex="1">
       
   221 +          <label id="UITourTooltipTitle" flex="1"/>
       
   222 +          <description id="UITourTooltipDescription" flex="1"/>
       
   223 +        </vbox>
       
   224 +      </hbox>
       
   225 +      <hbox id="UITourTooltipButtons" flex="1" align="center"/>
       
   226 +     </vbox>
   200 +    </panel>
   227 +    </panel>
   201 +    <html:div id="UITourHighlightContainer" style="position:relative">
   228 +    <!-- type="default" forces frames to be created so that the panel's size can be determined --> 
   202 +      <html:div id="UITourHighlight"></html:div>
   229 +    <panel id="UITourHighlightContainer"
   203 +    </html:div>
   230 +           type="default"
   204 +
       
   205 +    <panel id="socialActivatedNotification"
       
   206 +           type="arrow"
       
   207 +           hidden="true"
   231 +           hidden="true"
   208 +           align="start"
   232 +           noautofocus="true"
   209 +           orient="horizontal"
   233 +           noautohide="true"
   210 +           role="alert">
   234 +           flip="none"
   211 +      <image id="social-activation-icon" class="popup-notification-icon"/>
   235 +           consumeoutsideclicks="false"
   212 +      <vbox flex="1">
   236 +           mousethrough="always">
   213 +        <description id="social-activation-message" class="popup-notification-description">&social.activated.description;</description>
   237 +      <box id="UITourHighlight"></box>
   214 +        <spacer flex="1"/>
       
   215 +        <hbox pack="start" align="center" class="popup-notification-button-container">
       
   216 +          <label  id="social-undoactivation-button"
       
   217 +                  class="text-link"
       
   218 +                  value="&social.activated.undo.label;"
       
   219 +                  accesskey="&social.activated.undo.accesskey;"
       
   220 +                  onclick="SocialUI.undoActivation(this);"/>
       
   221 +          <spacer flex="1"/>
       
   222 +          <button id="social-activation-button"
       
   223 +                  default="true"
       
   224 +                  autofocus="autofocus"
       
   225 +                  label="&social.ok.label;"
       
   226 +                  accesskey="&social.ok.accesskey;"
       
   227 +                  oncommand="SocialUI.activationPanel.hidePopup();"/>
       
   228 +        </hbox>
       
   229 +      </vbox>
       
   230 +    </panel>
   238 +    </panel>
   231 +
   239 +
   232 +    <panel id="social-share-panel"
   240 +    <panel id="social-share-panel"
   233 +           class="social-panel"
   241 +           class="social-panel"
   234 +           type="arrow"
   242 +           type="arrow"
   257 +           rolluponmousewheel="true"
   265 +           rolluponmousewheel="true"
   258 +           noautofocus="true"
   266 +           noautofocus="true"
   259 +           position="topcenter topright"/>
   267 +           position="topcenter topright"/>
   260 +
   268 +
   261 +    <menupopup id="toolbar-context-menu"
   269 +    <menupopup id="toolbar-context-menu"
   262 +               onpopupshowing="onViewToolbarsPopupShowing(event);">
   270 +               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
       
   271 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
       
   272 +                accesskey="&customizeMenu.moveToPanel.accesskey;"
       
   273 +                label="&customizeMenu.moveToPanel.label;"
       
   274 +                class="customize-context-moveToPanel"/>
       
   275 +      <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
       
   276 +                accesskey="&customizeMenu.removeFromToolbar.accesskey;"
       
   277 +                label="&customizeMenu.removeFromToolbar.label;"
       
   278 +                class="customize-context-removeFromToolbar"/>
   263 +      <menuseparator/>
   279 +      <menuseparator/>
   264 +      <menuitem command="cmd_ToggleTabsOnTop"
   280 +      <menuseparator id="viewToolbarsMenuSeparator"/>
   265 +                type="checkbox"
   281 +      <!-- XXXgijs: we're using oncommand handler here to avoid the event being
   266 +                label="&viewTabsOnTop.label;"
   282 +                    redirected to the command element, thus preventing
   267 +                accesskey="&viewTabsOnTop.accesskey;"/>
   283 +                    listeners on the menupopup or further up the tree from
   268 +      <menuitem command="cmd_CustomizeToolbars"
   284 +                    seeing the command event pass by. The observes attribute is
       
   285 +                    here so that the menuitem is still disabled and re-enabled
       
   286 +                    correctly. -->
       
   287 +      <menuitem oncommand="BrowserCustomizeToolbar()"
       
   288 +                observes="cmd_CustomizeToolbars"
       
   289 +                class="viewCustomizeToolbar"
   269 +                label="&viewCustomizeToolbar.label;"
   290 +                label="&viewCustomizeToolbar.label;"
   270 +                accesskey="&viewCustomizeToolbar.accesskey;"/>
   291 +                accesskey="&viewCustomizeToolbar.accesskey;"/>
   271 +    </menupopup>
   292 +    </menupopup>
   272 +
   293 +
   273 +    <menupopup id="blockedPopupOptions"
   294 +    <menupopup id="blockedPopupOptions"
   380 +      <hbox pack="center">
   401 +      <hbox pack="center">
   381 +        <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/>
   402 +        <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/>
   382 +      </hbox>
   403 +      </hbox>
   383 +    </panel>
   404 +    </panel>
   384 +
   405 +
       
   406 +    <!-- Sync Panel -->
       
   407 +    <panel id="sync-start-panel" class="sync-panel" type="arrow" hidden="true"
       
   408 +           noautofocus="true" onclick="this.hidePopup();"
       
   409 +           flip="slide">
       
   410 +      <hbox class="sync-panel-outer">
       
   411 +        <image class="sync-panel-icon"/>
       
   412 +        <vbox class="sync-panel-inner">
       
   413 +          <description id="sync-start-panel-title"
       
   414 +                       value="&syncStartPanel.heading;"/>
       
   415 +          <description id="sync-start-panel-subtitle">
       
   416 +#ifdef XP_UNIX
       
   417 +            &syncStartPanel.subTitleUnix;
       
   418 +#else
       
   419 +            &syncStartPanel.subTitle;
       
   420 +#endif
       
   421 +          </description>
       
   422 +        </vbox>
       
   423 +      </hbox>
       
   424 +    </panel>
       
   425 +
       
   426 +    <!-- Sync Error Panel -->
       
   427 +    <panel id="sync-error-panel" class="sync-panel" type="arrow" hidden="true"
       
   428 +           noautofocus="true" onclick="this.hidePopup();"
       
   429 +           flip="slide">
       
   430 +      <hbox class="sync-panel-outer">
       
   431 +        <image class="sync-panel-icon"/>
       
   432 +        <vbox class="sync-panel-inner">
       
   433 +          <description id="sync-error-panel-title"
       
   434 +                       value="&syncErrorPanel.heading;"/>
       
   435 +          <description id="sync-error-panel-subtitle"
       
   436 +                       value="&syncErrorPanel.subTitle;"/>
       
   437 +          <hbox class="sync-panel-button-box">
       
   438 +            <spacer flex="1"/>
       
   439 +            <button class="sync-panel-button"
       
   440 +                    label="&syncErrorPanel.signInButton.label;"
       
   441 +                    accesskey="&syncErrorPanel.signInButton.accesskey;"
       
   442 +                    onclick="gFxAccounts.openSignInAgainPage();"/>
       
   443 +          </hbox>
       
   444 +        </vbox>
       
   445 +      </hbox>
       
   446 +    </panel>
       
   447 +
   385 +    <!-- Bookmarks and history tooltip -->
   448 +    <!-- Bookmarks and history tooltip -->
   386 +    <tooltip id="bhTooltip"/>
   449 +    <tooltip id="bhTooltip"/>
   387 +
       
   388 +    <panel id="customizeToolbarSheetPopup"
       
   389 +           noautohide="true"
       
   390 +           sheetstyle="&dialog.dimensions;"/>
       
   391 +
   450 +
   392 +    <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
   451 +    <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
   393 +
   452 +
   394 +    <tooltip id="back-button-tooltip">
   453 +    <tooltip id="back-button-tooltip">
   395 +      <label class="tooltip-label" value="&backButton.tooltip;"/>
   454 +      <label class="tooltip-label" value="&backButton.tooltip;"/>
   409 +#endif
   468 +#endif
   410 +    </tooltip>
   469 +    </tooltip>
   411 +
   470 +
   412 +#include popup-notifications.inc
   471 +#include popup-notifications.inc
   413 +
   472 +
       
   473 +#include ../../components/customizableui/content/panelUI.inc.xul
       
   474 +
   414 +    <hbox id="downloads-animation-container" mousethrough="always">
   475 +    <hbox id="downloads-animation-container" mousethrough="always">
   415 +      <vbox id="downloads-notification-anchor">
   476 +      <vbox id="downloads-notification-anchor">
   416 +        <vbox id="downloads-indicator-notification"/>
   477 +        <vbox id="downloads-indicator-notification"/>
   417 +      </vbox>
   478 +      </vbox>
   418 +    </hbox>
   479 +    </hbox>
       
   480 +
       
   481 +    <hbox id="bookmarked-notification-container" mousethrough="always">
       
   482 +      <vbox id="bookmarked-notification-anchor">
       
   483 +        <vbox id="bookmarked-notification"/>
       
   484 +      </vbox>
       
   485 +      <vbox id="bookmarked-notification-dropmarker-anchor">
       
   486 +        <image id="bookmarked-notification-dropmarker-icon"/>
       
   487 +      </vbox>
       
   488 +    </hbox>
       
   489 +
       
   490 +    <tooltip id="dynamic-shortcut-tooltip"
       
   491 +             onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
   419 +  </popupset>
   492 +  </popupset>
   420 +
   493 +
   421 +#ifdef CAN_DRAW_IN_TITLEBAR
   494 +#ifdef CAN_DRAW_IN_TITLEBAR
   422 +<vbox id="titlebar">
   495 +<vbox id="titlebar">
   423 +  <hbox id="titlebar-content">
   496 +  <hbox id="titlebar-content">
   424 +#ifdef MENUBAR_CAN_AUTOHIDE
       
   425 +    <hbox id="appmenu-button-container">
       
   426 +      <button id="appmenu-button"
       
   427 +              type="menu"
       
   428 +              label="&brandShortName;"
       
   429 +              style="-moz-user-focus: ignore;">
       
   430 +#include browser-appmenu.inc
       
   431 +      </button>
       
   432 +    </hbox>
       
   433 +#endif
       
   434 +    <spacer id="titlebar-spacer" flex="1"/>
   497 +    <spacer id="titlebar-spacer" flex="1"/>
   435 +    <hbox id="titlebar-buttonbox-container" align="start">
   498 +    <hbox id="titlebar-buttonbox-container">
       
   499 +#ifdef XP_WIN
       
   500 +      <hbox id="private-browsing-indicator-titlebar">
       
   501 +        <hbox class="private-browsing-indicator"/>
       
   502 +      </hbox>
       
   503 +#endif
   436 +      <hbox id="titlebar-buttonbox">
   504 +      <hbox id="titlebar-buttonbox">
   437 +        <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
   505 +        <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
   438 +        <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
   506 +        <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
   439 +        <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
   507 +        <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
   440 +      </hbox>
   508 +      </hbox>
   441 +    </hbox>
   509 +    </hbox>
       
   510 +#ifdef XP_MACOSX
       
   511 +    <hbox id="titlebar-fullscreen-button"/>
       
   512 +#endif
   442 +  </hbox>
   513 +  </hbox>
   443 +</vbox>
   514 +</vbox>
   444 +#endif
   515 +#endif
   445 +
   516 +
   446 +<deck flex="1" id="tab-view-deck">
   517 +<deck flex="1" id="tab-view-deck">
   447 +<vbox flex="1" id="browser-panel">
   518 +<vbox flex="1" id="browser-panel">
   448 +
   519 +
   449 +  <toolbox id="navigator-toolbox"
   520 +  <toolbox id="navigator-toolbox" mode="icons">
   450 +           defaultmode="icons" mode="icons"
       
   451 +           iconsize="large">
       
   452 +    <!-- Menu -->
   521 +    <!-- Menu -->
   453 +    <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
   522 +    <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
   454 +             defaultset="menubar-items"
   523 +             defaultset="menubar-items"
   455 +             mode="icons" iconsize="small" defaulticonsize="small"
   524 +             mode="icons" iconsize="small"
   456 +             lockiconsize="true"
       
   457 +#ifdef MENUBAR_CAN_AUTOHIDE
   525 +#ifdef MENUBAR_CAN_AUTOHIDE
   458 +             toolbarname="&menubarCmd.label;"
   526 +             toolbarname="&menubarCmd.label;"
   459 +             accesskey="&menubarCmd.accesskey;"
   527 +             accesskey="&menubarCmd.accesskey;"
       
   528 +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
       
   529 +             autohide="true"
       
   530 +#endif
   460 +#endif
   531 +#endif
   461 +             context="toolbar-context-menu">
   532 +             context="toolbar-context-menu">
   462 +      <toolbaritem id="menubar-items" align="center">
   533 +      <toolbaritem id="menubar-items" align="center"
       
   534 +                   cui-areatype="toolbar">
   463 +# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
   535 +# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
   464 +# hiddenWindow.xul.
   536 +# hiddenWindow.xul.
   465 +#include browser-menubar.inc
   537 +#include browser-menubar.inc
   466 +      </toolbaritem>
   538 +      </toolbaritem>
   467 +
   539 +
   468 +#ifdef CAN_DRAW_IN_TITLEBAR
   540 +#ifdef CAN_DRAW_IN_TITLEBAR
   469 +      <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
   541 +#ifndef XP_MACOSX
   470 +      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
   542 +      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"
       
   543 +            id="titlebar-placeholder-on-menubar-for-caption-buttons" persist="width"
       
   544 +            skipintoolbarset="true"/>
       
   545 +#endif
   471 +#endif
   546 +#endif
   472 +    </toolbar>
   547 +    </toolbar>
   473 +
   548 +
   474 +    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
   549 +    <toolbar id="TabsToolbar"
   475 +             toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
   550 +             class="toolbar-primary"
   476 +             fullscreentoolbar="true" mode="icons" customizable="true"
   551 +             fullscreentoolbar="true"
   477 +             iconsize="large"
   552 +             customizable="true"
   478 +             defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,window-controls"
   553 +             mode="icons"
   479 +             context="toolbar-context-menu">
   554 +             iconsize="small"
   480 +
   555 +             aria-label="&tabsToolbar.label;"
   481 +      <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
   556 +             context="toolbar-context-menu"
   482 +                   context="backForwardMenu" removable="true"
   557 +             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
   483 +                   forwarddisabled="true"
   558 +             collapsed="true">
   484 +                   title="&backForwardItem.title;">
   559 +
   485 +        <toolbarbutton id="back-button" class="toolbarbutton-1"
   560 +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
   486 +                       label="&backCmd.label;"
   561 +      <hbox id="private-browsing-indicator"
   487 +                       command="Browser:BackOrBackDuplicate"
   562 +            skipintoolbarset="true"/>
   488 +                       onclick="checkForMiddleClick(this, event);"
   563 +#endif
   489 +                       tooltip="back-button-tooltip"/>
   564 +
   490 +        <toolbarbutton id="forward-button" class="toolbarbutton-1"
   565 +      <tabs id="tabbrowser-tabs"
   491 +                       label="&forwardCmd.label;"
   566 +            class="tabbrowser-tabs"
   492 +                       command="Browser:ForwardOrForwardDuplicate"
   567 +            tabbrowser="content"
   493 +                       onclick="checkForMiddleClick(this, event);"
   568 +            flex="1"
   494 +                       tooltip="forward-button-tooltip"/>
   569 +            setfocus="false"
   495 +        <dummyobservertarget hidden="true"
   570 +            tooltip="tabbrowser-tab-tooltip"
   496 +                             onbroadcast="if (this.getAttribute('disabled') == 'true')
   571 +            cui-areatype="toolbar"
   497 +                                            this.parentNode.setAttribute('forwarddisabled', 'true');
   572 +            stopwatchid="FX_TAB_CLICK_MS">
   498 +                                          else
   573 +        <tab class="tabbrowser-tab" selected="true" fadein="true"/>
   499 +                                            this.parentNode.removeAttribute('forwarddisabled');">
   574 +      </tabs>
   500 +          <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
   575 +
   501 +        </dummyobservertarget>
   576 +      <toolbarbutton id="new-tab-button"
   502 +      </toolbaritem>
   577 +                     class="toolbarbutton-1 chromeclass-toolbar-additional"
   503 +
   578 +                     label="&tabCmd.label;"
   504 +      <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
   579 +                     command="cmd_newNavigatorTab"
   505 +                   title="&locationItem.title;" class="chromeclass-location" removable="true">
       
   506 +        <textbox id="urlbar" flex="1"
       
   507 +                 placeholder="&urlbar.placeholder2;"
       
   508 +                 type="autocomplete"
       
   509 +                 autocompletesearch="urlinline history"
       
   510 +                 autocompletesearchparam="enable-actions"
       
   511 +                 autocompletepopup="PopupAutoCompleteRichResult"
       
   512 +                 completeselectedindex="true"
       
   513 +                 tabscrolling="true"
       
   514 +                 showcommentcolumn="true"
       
   515 +                 showimagecolumn="true"
       
   516 +                 enablehistory="true"
       
   517 +                 maxrows="6"
       
   518 +                 newlines="stripsurroundingwhitespace"
       
   519 +                 oninput="gBrowser.userTypedValue = this.value;"
       
   520 +                 ontextentered="this.handleCommand(param);"
       
   521 +                 ontextreverted="return this.handleRevert();"
       
   522 +                 pageproxystate="invalid"
       
   523 +                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
       
   524 +                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
       
   525 +          <box id="notification-popup-box" hidden="true" align="center">
       
   526 +            <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
       
   527 +            <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
       
   528 +            <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
       
   529 +            <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
       
   530 +            <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
       
   531 +            <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
       
   532 +            <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
       
   533 +            <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
       
   534 +            <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
       
   535 +            <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
       
   536 +            <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
       
   537 +            <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
       
   538 +            <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
       
   539 +            <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
       
   540 +            <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
       
   541 +          </box>
       
   542 +          <!-- Use onclick instead of normal popup= syntax since the popup
       
   543 +               code fires onmousedown, and hence eats our favicon drag events.
       
   544 +               We only add the identity-box button to the tab order when the location bar
       
   545 +               has focus, otherwise pressing F6 focuses it instead of the location bar -->
       
   546 +          <box id="identity-box" role="button"
       
   547 +               align="center"
       
   548 +               onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
       
   549 +               onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
       
   550 +               ondragstart="gIdentityHandler.onDragStart(event);">
       
   551 +            <image id="page-proxy-favicon"
       
   552 +                   onclick="PageProxyClickHandler(event);"
       
   553 +                   pageproxystate="invalid"/>
       
   554 +            <hbox id="identity-icon-labels">
       
   555 +              <label id="identity-icon-label" class="plain" flex="1"/>
       
   556 +              <label id="identity-icon-country-label" class="plain"/>
       
   557 +            </hbox>
       
   558 +          </box>
       
   559 +          <box id="urlbar-display-box" align="center">
       
   560 +            <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
       
   561 +          </box>
       
   562 +          <hbox id="urlbar-icons">
       
   563 +            <image id="page-report-button"
       
   564 +                   class="urlbar-icon"
       
   565 +                   hidden="true"
       
   566 +                   tooltiptext="&pageReportIcon.tooltip;"
       
   567 +                   onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
       
   568 +            <image id="star-button"
       
   569 +                   class="urlbar-icon"
       
   570 +                   onclick="if (event.button === 0) BookmarkingUI.onCommand(event);"/>
       
   571 +            <image id="go-button"
       
   572 +                   class="urlbar-icon"
       
   573 +                   tooltiptext="&goEndCap.tooltip;"
       
   574 +                   onclick="gURLBar.handleCommand(event);"/>
       
   575 +          </hbox>
       
   576 +          <toolbarbutton id="urlbar-go-button"
       
   577 +                         class="chromeclass-toolbar-additional"
       
   578 +                         onclick="gURLBar.handleCommand(event);"
       
   579 +                         tooltiptext="&goEndCap.tooltip;"/>
       
   580 +          <toolbarbutton id="urlbar-reload-button"
       
   581 +                         class="chromeclass-toolbar-additional"
       
   582 +                         command="Browser:ReloadOrDuplicate"
       
   583 +                         onclick="checkForMiddleClick(this, event);"
       
   584 +                         tooltiptext="&reloadButton.tooltip;"/>
       
   585 +          <toolbarbutton id="urlbar-stop-button"
       
   586 +                         class="chromeclass-toolbar-additional"
       
   587 +                         command="Browser:Stop"
       
   588 +                         tooltiptext="&stopButton.tooltip;"/>
       
   589 +        </textbox>
       
   590 +      </toolbaritem>
       
   591 +
       
   592 +      <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   593 +                     label="&reloadCmd.label;" removable="true"
       
   594 +                     command="Browser:ReloadOrDuplicate"
       
   595 +                     onclick="checkForMiddleClick(this, event);"
   580 +                     onclick="checkForMiddleClick(this, event);"
   596 +                     tooltiptext="&reloadButton.tooltip;"/>
   581 +                     tooltiptext="&newTabButton.tooltip;"
   597 +
   582 +                     ondrop="newTabButtonObserver.onDrop(event)"
   598 +      <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
   583 +                     ondragover="newTabButtonObserver.onDragOver(event)"
   599 +                     label="&stopCmd.label;" removable="true"
   584 +                     ondragenter="newTabButtonObserver.onDragOver(event)"
   600 +                     command="Browser:Stop"
   585 +                     ondragexit="newTabButtonObserver.onDragExit(event)"
   601 +                     tooltiptext="&stopButton.tooltip;"/>
   586 +                     cui-areatype="toolbar"
   602 +
   587 +                     removable="true"/>
   603 +      <toolbaritem id="search-container" title="&searchItem.title;"
   588 +
   604 +                   align="center" class="chromeclass-toolbar-additional"
   589 +      <toolbarbutton id="alltabs-button"
   605 +                   flex="100" persist="width" removable="true">
   590 +                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
   606 +        <searchbar id="searchbar" flex="1"/>
       
   607 +      </toolbaritem>
       
   608 +
       
   609 +      <toolbarbutton id="webrtc-status-button"
       
   610 +                     class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   611 +                     type="menu"
   591 +                     type="menu"
   612 +                     hidden="true"
   592 +                     label="&listAllTabs.label;"
   613 +                     orient="horizontal"
   593 +                     tooltiptext="&listAllTabs.label;"
   614 +                     label="&webrtcIndicatorButton.label;"
   594 +                     removable="false">
   615 +                     tooltiptext="&webrtcIndicatorButton.tooltip;">
   595 +        <menupopup id="alltabs-popup"
   616 +        <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
   596 +                   position="after_end">
   617 +                   onpopuphiding="WebrtcIndicator.clearPopup(this);"
   597 +          <menuitem id="menu_tabview"
   618 +                   oncommand="WebrtcIndicator.menuCommand(event.target);"/>
       
   619 +      </toolbarbutton>
       
   620 +
       
   621 +      <toolbarbutton id="bookmarks-menu-button"
       
   622 +                     class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   623 +                     persist="class"
       
   624 +                     removable="true"
       
   625 +                     type="menu"
       
   626 +                     label="&bookmarksMenuButton.label;"
       
   627 +                     tooltiptext="&bookmarksMenuButton.tooltip;"
       
   628 +                     ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
       
   629 +                     ondragover="PlacesMenuDNDHandler.onDragOver(event);"
       
   630 +                     ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
       
   631 +                     ondrop="PlacesMenuDNDHandler.onDrop(event);">
       
   632 +        <menupopup id="BMB_bookmarksPopup"
       
   633 +                   placespopup="true"
       
   634 +                   context="placesContext"
       
   635 +                   openInTabs="children"
       
   636 +                   oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
       
   637 +                   onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
       
   638 +                   onpopupshowing="BookmarkingUI.onPopupShowing(event);
       
   639 +                                   if (!this.parentNode._placesView)
       
   640 +                                     new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
       
   641 +                   tooltip="bhTooltip" popupsinherittooltip="true">
       
   642 +          <menuitem id="BMB_viewBookmarksToolbar"
       
   643 +                    placesanonid="view-toolbar"
       
   644 +                    toolbarId="PersonalToolbar"
       
   645 +                    type="checkbox"
       
   646 +                    oncommand="onViewToolbarCommand(event)"
       
   647 +                    label="&viewBookmarksToolbar.label;"/>
       
   648 +          <menuseparator/>
       
   649 +          <menuitem id="BMB_bookmarksShowAll"
       
   650 +                    label="&showAllBookmarks2.label;"
       
   651 +                    command="Browser:ShowAllBookmarks"
       
   652 +                    key="manBookmarkKb"/>
       
   653 +          <menuseparator/>
       
   654 +          <menuitem id="BMB_bookmarkThisPage"
       
   655 +#ifndef XP_MACOSX
       
   656 +                    class="menuitem-iconic"
   598 +                    class="menuitem-iconic"
   657 +#endif
   599 +                    key="key_tabview"
   658 +                    label="&bookmarkThisPageCmd.label;"
   600 +                    label="&viewTabGroups.label;"
   659 +                    command="Browser:AddBookmarkAs"
   601 +                    command="Browser:ToggleTabView"
   660 +                    key="addBookmarkAsKb"/>
   602 +                    cui-areatype="toolbar"
   661 +          <menuitem id="BMB_subscribeToPageMenuitem"
   603 +                    observes="tabviewGroupsNumber"/>
   662 +#ifndef XP_MACOSX
   604 +          <menuseparator id="alltabs-popup-separator"/>
   663 +                    class="menuitem-iconic"
       
   664 +#endif
       
   665 +                    label="&subscribeToPageMenuitem.label;"
       
   666 +                    oncommand="return FeedHandler.subscribeToFeed(null, event);"
       
   667 +                    onclick="checkForMiddleClick(this, event);"
       
   668 +                    observes="singleFeedMenuitemState"/>
       
   669 +          <menu id="BMB_subscribeToPageMenupopup"
       
   670 +#ifndef XP_MACOSX
       
   671 +                class="menu-iconic"
       
   672 +#endif
       
   673 +                label="&subscribeToPageMenupopup.label;"
       
   674 +                observes="multipleFeedsMenuState">
       
   675 +            <menupopup id="BMB_subscribeToPageSubmenuMenupopup"
       
   676 +                       onpopupshowing="return FeedHandler.buildFeedList(event.target);"
       
   677 +                       oncommand="return FeedHandler.subscribeToFeed(null, event);"
       
   678 +                       onclick="checkForMiddleClick(this, event);"/>
       
   679 +          </menu>
       
   680 +          <menuseparator/>
       
   681 +          <menu id="BMB_bookmarksToolbar"
       
   682 +                placesanonid="toolbar-autohide"
       
   683 +                class="menu-iconic bookmark-item"
       
   684 +                label="&personalbarCmd.label;"
       
   685 +                container="true">
       
   686 +            <menupopup id="BMB_bookmarksToolbarPopup"
       
   687 +                       placespopup="true"
       
   688 +                       context="placesContext"
       
   689 +                       onpopupshowing="if (!this.parentNode._placesView)
       
   690 +                                         new PlacesMenu(event, 'place:folder=TOOLBAR');"/>
       
   691 +          </menu>
       
   692 +          <menuseparator/>
       
   693 +          <!-- Bookmarks menu items -->
       
   694 +          <menuseparator builder="end"
       
   695 +                         class="hide-if-empty-places-result"/>
       
   696 +          <menuitem id="BMB_unsortedBookmarks"
       
   697 +                    label="&bookmarksMenuButton.unsorted.label;"
       
   698 +                    oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"
       
   699 +                    class="menuitem-iconic"/>
       
   700 +        </menupopup>
   605 +        </menupopup>
   701 +      </toolbarbutton>
   606 +      </toolbarbutton>
   702 +
   607 +
   703 +      <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
   608 +      <toolbarbutton id="tabs-closebutton"
   704 +                     persist="class" removable="true"
   609 +                     class="close-button tabs-closebutton close-icon"
   705 +                     label="&homeButton.label;"
   610 +                     command="cmd_close"
   706 +                     ondragover="homeButtonObserver.onDragOver(event)"
   611 +                     label="&closeTab.label;"
   707 +                     ondragenter="homeButtonObserver.onDragOver(event)"
   612 +                     cui-areatype="toolbar"
   708 +                     ondrop="homeButtonObserver.onDrop(event)"
   613 +                     tooltiptext="&closeTab.label;"/>
   709 +                     ondragexit="homeButtonObserver.onDragExit(event)"
   614 +
   710 +                     onclick="BrowserGoHome(event);"
   615 +#ifdef XP_WIN
   711 +                     aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
   616 +      <hbox class="private-browsing-indicator" skipintoolbarset="true" ordinal="1000"/>
   712 +
   617 +#endif
   713 +      <toolbarbutton id="social-share-button"
   618 +#ifdef CAN_DRAW_IN_TITLEBAR
   714 +                     class="toolbarbutton-1 chromeclass-toolbar-additional"
   619 +      <hbox class="titlebar-placeholder" type="caption-buttons"
   715 +                     hidden="true"
   620 +            id="titlebar-placeholder-on-TabsToolbar-for-captions-buttons" persist="width"
   716 +                     label="&sharePageCmd.label;"
   621 +#ifndef XP_MACOSX
   717 +                     tooltiptext="&sharePageCmd.label;"
   622 +            ordinal="1000"
   718 +                     command="Social:SharePage"/>
   623 +#endif
   719 +
   624 +            skipintoolbarset="true"/>
   720 +      <toolbaritem id="social-toolbar-item"
   625 +
   721 +                   class="chromeclass-toolbar-additional"
   626 +#ifdef XP_MACOSX
   722 +                   removable="false"
   627 +      <hbox class="titlebar-placeholder" type="fullscreen-button"
   723 +                   title="&socialToolbar.title;"
   628 +            id="titlebar-placeholder-on-TabsToolbar-for-fullscreen-button" persist="width"
   724 +                   hidden="true"
   629 +            skipintoolbarset="true"/>
   725 +                   skipintoolbarset="true"
   630 +#endif
   726 +                   observes="socialActiveBroadcaster">
   631 +#endif
   727 +        <toolbarbutton id="social-notification-icon" class="default-notification-icon toolbarbutton-1 notification-anchor-icon"
   632 +    </toolbar>
   728 +                   oncommand="PopupNotifications._reshowNotifications(this,
   633 +
   729 +                                document.getElementById('social-sidebar-browser'));"/>
   634 +    <!--
   730 +        <toolbarbutton id="social-provider-button"
   635 +           CAVEAT EMPTOR
   731 +                       class="toolbarbutton-1"
   636 +           Should you need to add items to the toolbar here, make sure to also add them
   732 +                       type="menu">
   637 +           to the default placements of buttons in CustomizableUI.jsm, so the
   733 +          <menupopup id="social-statusarea-popup">
   638 +           customization code doesn't get confused.
   734 +            <menuitem class="social-statusarea-user menuitem-iconic" pack="start" align="center"
   639 +      -->
   735 +                      observes="socialBroadcaster_userDetails"
   640 +    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
   736 +                      oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();">
   641 +             aria-label="&navbarCmd.label;"
   737 +              <image class="social-statusarea-user-portrait"
   642 +             fullscreentoolbar="true" mode="icons" customizable="true"
   738 +                     observes="socialBroadcaster_userDetails"/>
   643 +             iconsize="small"
   739 +              <vbox>
   644 +             defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item"
   740 +                <label class="social-statusarea-loggedInStatus"
   645 +             customizationtarget="nav-bar-customization-target"
   741 +                       observes="socialBroadcaster_userDetails"/>
   646 +             overflowable="true"
   742 +              </vbox>
   647 +             overflowbutton="nav-bar-overflow-button"
       
   648 +             overflowtarget="widget-overflow-list"
       
   649 +             overflowpanel="widget-overflow"
       
   650 +             context="toolbar-context-menu">
       
   651 +
       
   652 +      <hbox id="nav-bar-customization-target" flex="1">
       
   653 +        <toolbaritem id="urlbar-container" flex="400" persist="width"
       
   654 +                     forwarddisabled="true" title="&locationItem.title;" removable="false"
       
   655 +                     cui-areatype="toolbar"
       
   656 +                     class="chromeclass-location" overflows="false">
       
   657 +          <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   658 +                         label="&backCmd.label;"
       
   659 +                         command="Browser:BackOrBackDuplicate"
       
   660 +                         cui-areatype="toolbar"
       
   661 +                         onclick="checkForMiddleClick(this, event);"
       
   662 +                         tooltip="back-button-tooltip"
       
   663 +                         context="backForwardMenu"/>
       
   664 +          <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   665 +                         label="&forwardCmd.label;"
       
   666 +                         command="Browser:ForwardOrForwardDuplicate"
       
   667 +                         cui-areatype="toolbar"
       
   668 +                         onclick="checkForMiddleClick(this, event);"
       
   669 +                         tooltip="forward-button-tooltip"
       
   670 +                         context="backForwardMenu"/>
       
   671 +          <dummyobservertarget hidden="true"
       
   672 +                               onbroadcast="if (this.getAttribute('disabled') == 'true')
       
   673 +                                              this.parentNode.setAttribute('forwarddisabled', 'true');
       
   674 +                                            else
       
   675 +                                              this.parentNode.removeAttribute('forwarddisabled');">
       
   676 +            <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
       
   677 +          </dummyobservertarget>
       
   678 +          <hbox id="urlbar-wrapper" flex="1" align="center">
       
   679 +            <textbox id="urlbar" flex="1"
       
   680 +                     placeholder="&urlbar.placeholder2;"
       
   681 +                     type="autocomplete"
       
   682 +                     autocompletesearch="urlinline history"
       
   683 +                     autocompletesearchparam="enable-actions"
       
   684 +                     autocompletepopup="PopupAutoCompleteRichResult"
       
   685 +                     completeselectedindex="true"
       
   686 +                     tabscrolling="true"
       
   687 +                     showcommentcolumn="true"
       
   688 +                     showimagecolumn="true"
       
   689 +                     enablehistory="true"
       
   690 +                     maxrows="6"
       
   691 +                     newlines="stripsurroundingwhitespace"
       
   692 +                     oninput="gBrowser.userTypedValue = this.value;"
       
   693 +                     ontextentered="this.handleCommand(param);"
       
   694 +                     ontextreverted="return this.handleRevert();"
       
   695 +                     pageproxystate="invalid"
       
   696 +                     onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
       
   697 +                     onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
       
   698 +              <box id="notification-popup-box" hidden="true" align="center">
       
   699 +                <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
       
   700 +                <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
       
   701 +                <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
       
   702 +                <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
       
   703 +                <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
       
   704 +                <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
       
   705 +                <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
       
   706 +                <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
       
   707 +                <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
       
   708 +                <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
       
   709 +                <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
       
   710 +                <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
       
   711 +                <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
       
   712 +                <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
       
   713 +                <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
       
   714 +              </box>
       
   715 +              <!-- Use onclick instead of normal popup= syntax since the popup
       
   716 +                   code fires onmousedown, and hence eats our favicon drag events.
       
   717 +                   We only add the identity-box button to the tab order when the location bar
       
   718 +                   has focus, otherwise pressing F6 focuses it instead of the location bar -->
       
   719 +              <box id="identity-box" role="button"
       
   720 +                   align="center"
       
   721 +                   onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
       
   722 +                   onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
       
   723 +                   ondragstart="gIdentityHandler.onDragStart(event);">
       
   724 +                <image id="page-proxy-favicon"
       
   725 +                       onclick="PageProxyClickHandler(event);"
       
   726 +                       pageproxystate="invalid"/>
       
   727 +                <hbox id="identity-icon-labels">
       
   728 +                  <label id="identity-icon-label" class="plain" flex="1"/>
       
   729 +                  <label id="identity-icon-country-label" class="plain"/>
       
   730 +                </hbox>
       
   731 +              </box>
       
   732 +              <box id="urlbar-display-box" align="center">
       
   733 +                <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
       
   734 +              </box>
       
   735 +              <hbox id="urlbar-icons">
       
   736 +                <image id="page-report-button"
       
   737 +                       class="urlbar-icon"
       
   738 +                       hidden="true"
       
   739 +                       tooltiptext="&pageReportIcon.tooltip;"
       
   740 +                       onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
       
   741 +              </hbox>
       
   742 +              <toolbarbutton id="urlbar-go-button"
       
   743 +                             class="chromeclass-toolbar-additional"
       
   744 +                             onclick="gURLBar.handleCommand(event);"
       
   745 +                             tooltiptext="&goEndCap.tooltip;"/>
       
   746 +              <toolbarbutton id="urlbar-reload-button"
       
   747 +                             class="chromeclass-toolbar-additional"
       
   748 +                             command="Browser:ReloadOrDuplicate"
       
   749 +                             onclick="checkForMiddleClick(this, event);"
       
   750 +                             tooltiptext="&reloadButton.tooltip;"/>
       
   751 +              <toolbarbutton id="urlbar-stop-button"
       
   752 +                             class="chromeclass-toolbar-additional"
       
   753 +                             command="Browser:Stop"
       
   754 +                             tooltiptext="&stopButton.tooltip;"/>
       
   755 +            </textbox>
       
   756 +          </hbox>
       
   757 +        </toolbaritem>
       
   758 +
       
   759 +        <toolbaritem id="search-container" title="&searchItem.title;"
       
   760 +                     align="center" class="chromeclass-toolbar-additional panel-wide-item"
       
   761 +                     cui-areatype="toolbar"
       
   762 +                     flex="100" persist="width" removable="true">
       
   763 +          <searchbar id="searchbar" flex="1"/>
       
   764 +        </toolbaritem>
       
   765 +
       
   766 +        <toolbarbutton id="webrtc-status-button"
       
   767 +                       class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   768 +                       type="menu"
       
   769 +                       hidden="true"
       
   770 +                       orient="horizontal"
       
   771 +                       label="&webrtcIndicatorButton.label;"
       
   772 +                       tooltiptext="&webrtcIndicatorButton.tooltip;"
       
   773 +                       cui-areatype="toolbar"
       
   774 +                       overflows="false">
       
   775 +          <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
       
   776 +                     onpopuphiding="WebrtcIndicator.clearPopup(this);"
       
   777 +                     oncommand="WebrtcIndicator.menuCommand(event.target);"/>
       
   778 +        </toolbarbutton>
       
   779 +
       
   780 +        <toolbarbutton id="bookmarks-menu-button"
       
   781 +                       class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   782 +                       persist="class"
       
   783 +                       removable="true"
       
   784 +                       type="menu-button"
       
   785 +                       label="&bookmarksMenuButton.label;"
       
   786 +                       tooltip="dynamic-shortcut-tooltip"
       
   787 +                       anchor="dropmarker"
       
   788 +                       ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
       
   789 +                       ondragover="PlacesMenuDNDHandler.onDragOver(event);"
       
   790 +                       ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
       
   791 +                       ondrop="PlacesMenuDNDHandler.onDrop(event);"
       
   792 +                       cui-areatype="toolbar"
       
   793 +                       oncommand="BookmarkingUI.onCommand(event);">
       
   794 +          <menupopup id="BMB_bookmarksPopup"
       
   795 +                     class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView"
       
   796 +                     placespopup="true"
       
   797 +                     context="placesContext"
       
   798 +                     openInTabs="children"
       
   799 +                     oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
       
   800 +                     onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
       
   801 +                     onpopupshowing="BookmarkingUI.onPopupShowing(event);
       
   802 +                                     BookmarkingUI.attachPlacesView(event, this);"
       
   803 +                     tooltip="bhTooltip" popupsinherittooltip="true">
       
   804 +            <menuitem id="BMB_viewBookmarksSidebar"
       
   805 +                      class="subviewbutton"
       
   806 +                      label="&viewBookmarksSidebar2.label;"
       
   807 +                      type="checkbox"
       
   808 +                      oncommand="toggleSidebar('viewBookmarksSidebar');">
       
   809 +              <observes element="viewBookmarksSidebar" attribute="checked"/>
   743 +            </menuitem>
   810 +            </menuitem>
   744 +#ifndef XP_WIN
       
   745 +            <menuseparator class="social-statusarea-separator"/>
       
   746 +#endif
       
   747 +            <menuitem class="social-toggle-sidebar-menuitem"
       
   748 +                      type="checkbox"
       
   749 +                      autocheck="false"
       
   750 +                      command="Social:ToggleSidebar"
       
   751 +                      label="&social.toggleSidebar.label;"
       
   752 +                      accesskey="&social.toggleSidebar.accesskey;"/>
       
   753 +            <menuitem class="social-toggle-notifications-menuitem"
       
   754 +                      type="checkbox"
       
   755 +                      autocheck="false"
       
   756 +                      command="Social:ToggleNotifications"
       
   757 +                      label="&social.toggleNotifications.label;"
       
   758 +                      accesskey="&social.toggleNotifications.accesskey;"/>
       
   759 +            <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
       
   760 +            <menuseparator/>
   811 +            <menuseparator/>
   761 +            <menuseparator class="social-provider-menu" hidden="true"/>
   812 +            <menuitem id="BMB_subscribeToPageMenuitem"
   762 +            <menuitem class="social-addons-menuitem" command="Social:Addons"
   813 +#ifndef XP_MACOSX
   763 +                      label="&social.addons.label;"/>
   814 +                      class="menuitem-iconic subviewbutton"
   764 +            <menuitem label="&social.learnMore.label;"
   815 +#else
   765 +                      accesskey="&social.learnMore.accesskey;"
   816 +                      class="subviewbutton"
   766 +                      oncommand="SocialUI.showLearnMore();"/>
   817 +#endif
       
   818 +                      label="&subscribeToPageMenuitem.label;"
       
   819 +                      oncommand="return FeedHandler.subscribeToFeed(null, event);"
       
   820 +                      onclick="checkForMiddleClick(this, event);"
       
   821 +                      observes="singleFeedMenuitemState"/>
       
   822 +            <menu id="BMB_subscribeToPageMenupopup"
       
   823 +#ifndef XP_MACOSX
       
   824 +                  class="menu-iconic subviewbutton"
       
   825 +#else
       
   826 +                  class="subviewbutton"
       
   827 +#endif
       
   828 +                  label="&subscribeToPageMenupopup.label;"
       
   829 +                  observes="multipleFeedsMenuState">
       
   830 +              <menupopup id="BMB_subscribeToPageSubmenuMenupopup"
       
   831 +                         onpopupshowing="return FeedHandler.buildFeedList(event.target);"
       
   832 +                         oncommand="return FeedHandler.subscribeToFeed(null, event);"
       
   833 +                         onclick="checkForMiddleClick(this, event);"/>
       
   834 +            </menu>
       
   835 +            <menuseparator/>
       
   836 +            <menu id="BMB_bookmarksToolbar"
       
   837 +                  class="menu-iconic bookmark-item subviewbutton"
       
   838 +                  label="&personalbarCmd.label;"
       
   839 +                  container="true">
       
   840 +              <menupopup id="BMB_bookmarksToolbarPopup"
       
   841 +                         placespopup="true"
       
   842 +                         context="placesContext"
       
   843 +                         onpopupshowing="if (!this.parentNode._placesView)
       
   844 +                                           new PlacesMenu(event, 'place:folder=TOOLBAR',
       
   845 +                                                          PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);">
       
   846 +                <menuitem id="BMB_viewBookmarksToolbar"
       
   847 +                          placesanonid="view-toolbar"
       
   848 +                          toolbarId="PersonalToolbar"
       
   849 +                          type="checkbox"
       
   850 +                          oncommand="onViewToolbarCommand(event)"
       
   851 +                          label="&viewBookmarksToolbar.label;"/>
       
   852 +                <menuseparator/>
       
   853 +                <!-- Bookmarks toolbar items -->
       
   854 +              </menupopup>
       
   855 +            </menu>
       
   856 +            <menu id="BMB_unsortedBookmarks"
       
   857 +                  class="menu-iconic bookmark-item subviewbutton"
       
   858 +                  label="&bookmarksMenuButton.unsorted.label;"
       
   859 +                  container="true">
       
   860 +              <menupopup id="BMB_unsortedBookmarksPopup"
       
   861 +                         placespopup="true"
       
   862 +                         context="placesContext"
       
   863 +                         onpopupshowing="if (!this.parentNode._placesView)
       
   864 +                                           new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
       
   865 +                                                          PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
       
   866 +            </menu>
       
   867 +            <menuseparator/>
       
   868 +            <!-- Bookmarks menu items will go here -->
       
   869 +            <menuitem id="BMB_bookmarksShowAll"
       
   870 +                      class="subviewbutton panel-subview-footer"
       
   871 +                      label="&showAllBookmarks2.label;"
       
   872 +                      command="Browser:ShowAllBookmarks"
       
   873 +                      key="manBookmarkKb"/>
   767 +          </menupopup>
   874 +          </menupopup>
   768 +        </toolbarbutton>
   875 +        </toolbarbutton>
       
   876 +
       
   877 +        <!-- This is a placeholder for the Downloads Indicator.  It is visible
       
   878 +             during the customization of the toolbar, in the palette, and before
       
   879 +             the Downloads Indicator overlay is loaded. -->
       
   880 +        <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   881 +                       oncommand="DownloadsIndicatorView.onCommand(event);"
       
   882 +                       ondrop="DownloadsIndicatorView.onDrop(event);"
       
   883 +                       ondragover="DownloadsIndicatorView.onDragOver(event);"
       
   884 +                       ondragenter="DownloadsIndicatorView.onDragOver(event);"
       
   885 +                       label="&downloads.label;"
       
   886 +                       removable="true"
       
   887 +                       cui-areatype="toolbar"
       
   888 +                       tooltiptext="&downloads.tooltip;"/>
       
   889 +
       
   890 +        <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   891 +                       persist="class" removable="true"
       
   892 +                       label="&homeButton.label;"
       
   893 +                       ondragover="homeButtonObserver.onDragOver(event)"
       
   894 +                       ondragenter="homeButtonObserver.onDragOver(event)"
       
   895 +                       ondrop="homeButtonObserver.onDrop(event)"
       
   896 +                       ondragexit="homeButtonObserver.onDragExit(event)"
       
   897 +                       onclick="BrowserGoHome(event);"
       
   898 +                       cui-areatype="toolbar"
       
   899 +                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
       
   900 +
       
   901 +
       
   902 +        <toolbarbutton id="social-share-button"
       
   903 +                       class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   904 +                       hidden="true"
       
   905 +                       overflows="false"
       
   906 +                       label="&sharePageCmd.label;"
       
   907 +                       tooltiptext="&sharePageCmd.label;"
       
   908 +                       cui-areatype="toolbar"
       
   909 +                       command="Social:SharePage"/>
       
   910 +      </hbox>
       
   911 +
       
   912 +      <toolbarbutton id="nav-bar-overflow-button"
       
   913 +                     class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
       
   914 +                     cui-areatype="toolbar"
       
   915 +                     skipintoolbarset="true"
       
   916 +                     tooltiptext="&navbarOverflow.label;"/>
       
   917 +
       
   918 +      <toolbaritem id="PanelUI-button"
       
   919 +                   class="chromeclass-toolbar-additional"
       
   920 +                   cui-areatype="toolbar"
       
   921 +                   removable="false">
       
   922 +        <toolbarbutton id="PanelUI-menu-button"
       
   923 +                       class="toolbarbutton-1"
       
   924 +                       cui-areatype="toolbar"
       
   925 +                       label="&brandShortName;"
       
   926 +                       tooltiptext="&appmenu.tooltip;"/>
   769 +      </toolbaritem>
   927 +      </toolbaritem>
   770 +
   928 +
   771 +      <hbox id="window-controls" hidden="true" pack="end">
   929 +      <hbox id="window-controls" hidden="true" pack="end" skipintoolbarset="true"
       
   930 +            ordinal="1000">
   772 +        <toolbarbutton id="minimize-button"
   931 +        <toolbarbutton id="minimize-button"
   773 +                       tooltiptext="&fullScreenMinimize.tooltip;"
   932 +                       tooltiptext="&fullScreenMinimize.tooltip;"
   774 +                       oncommand="window.minimize();"/>
   933 +                       oncommand="window.minimize();"/>
   775 +
   934 +
   776 +        <toolbarbutton id="restore-button"
   935 +        <toolbarbutton id="restore-button"
       
   936 +#ifdef XP_MACOSX
       
   937 +# Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button
       
   938 +# to exit fullscreen and want it to behave like other toolbar buttons.
       
   939 +                       class="toolbarbutton-1"
       
   940 +                       cui-areatype="toolbar"
       
   941 +#endif
   777 +                       tooltiptext="&fullScreenRestore.tooltip;"
   942 +                       tooltiptext="&fullScreenRestore.tooltip;"
   778 +                       oncommand="BrowserFullScreen();"/>
   943 +                       oncommand="BrowserFullScreen();"/>
   779 +
   944 +
   780 +        <toolbarbutton id="close-button"
   945 +        <toolbarbutton id="close-button"
   781 +                       tooltiptext="&fullScreenClose.tooltip;"
   946 +                       tooltiptext="&fullScreenClose.tooltip;"
   784 +    </toolbar>
   949 +    </toolbar>
   785 +
   950 +
   786 +    <toolbarset id="customToolbars" context="toolbar-context-menu"/>
   951 +    <toolbarset id="customToolbars" context="toolbar-context-menu"/>
   787 +
   952 +
   788 +    <toolbar id="PersonalToolbar"
   953 +    <toolbar id="PersonalToolbar"
   789 +             mode="icons" iconsize="small" defaulticonsize="small"
   954 +             mode="icons" iconsize="small"
   790 +             lockiconsize="true"
       
   791 +             class="chromeclass-directories"
   955 +             class="chromeclass-directories"
   792 +             context="toolbar-context-menu"
   956 +             context="toolbar-context-menu"
   793 +             defaultset="personal-bookmarks"
   957 +             defaultset="personal-bookmarks"
   794 +             toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
   958 +             toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
   795 +             collapsed="true"
   959 +             collapsed="true"
   796 +             customizable="true">
   960 +             customizable="true">
   797 +      <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;"
   961 +      <toolbaritem id="personal-bookmarks"
       
   962 +                   flex="1"
       
   963 +                   title="&bookmarksToolbarItem.label;"
       
   964 +                   cui-areatype="toolbar"
   798 +                   removable="true">
   965 +                   removable="true">
       
   966 +        <toolbarbutton id="bookmarks-toolbar-placeholder"
       
   967 +                       class="toolbarbutton-1"
       
   968 +                       mousethrough="never"
       
   969 +                       label="&bookmarksToolbarItem.label;"
       
   970 +                       oncommand="PlacesToolbarHelper.onPlaceholderCommand();"/>
   799 +        <hbox flex="1"
   971 +        <hbox flex="1"
   800 +              id="PlacesToolbar"
   972 +              id="PlacesToolbar"
   801 +              context="placesContext"
   973 +              context="placesContext"
   802 +              onclick="BookmarksEventHandler.onClick(event, this._placesView);"
   974 +              onclick="BookmarksEventHandler.onClick(event, this._placesView);"
   803 +              oncommand="BookmarksEventHandler.onCommand(event, this._placesView);"
   975 +              oncommand="BookmarksEventHandler.onCommand(event, this._placesView);"
   804 +              tooltip="bhTooltip"
   976 +              tooltip="bhTooltip"
   805 +              popupsinherittooltip="true">
   977 +              popupsinherittooltip="true">
   806 +          <toolbarbutton class="bookmark-item bookmarks-toolbar-customize"
       
   807 +                         mousethrough="never"
       
   808 +                         label="&bookmarksToolbarItem.label;"/>
       
   809 +          <hbox flex="1">
   978 +          <hbox flex="1">
   810 +            <hbox align="center">
   979 +            <hbox id="PlacesToolbarDropIndicatorHolder" align="center" collapsed="true">
   811 +              <image id="PlacesToolbarDropIndicator"
   980 +              <image id="PlacesToolbarDropIndicator"
   812 +                     mousethrough="always"
   981 +                     mousethrough="always"
   813 +                     collapsed="true"/>
   982 +                     collapsed="true"/>
   814 +            </hbox>
   983 +            </hbox>
   815 +            <scrollbox orient="horizontal"
   984 +            <scrollbox orient="horizontal"
   831 +          </hbox>
  1000 +          </hbox>
   832 +        </hbox>
  1001 +        </hbox>
   833 +      </toolbaritem>
  1002 +      </toolbaritem>
   834 +    </toolbar>
  1003 +    </toolbar>
   835 +
  1004 +
   836 +#ifdef MENUBAR_CAN_AUTOHIDE
  1005 +    <!-- This is a shim which will go away ASAP. See bug 749804 for details -->
   837 +#ifndef CAN_DRAW_IN_TITLEBAR
  1006 +    <toolbar id="addon-bar" toolbar-delegate="nav-bar" mode="icons" iconsize="small"
   838 +#define APPMENU_ON_TABBAR
  1007 +             customizable="true">
   839 +#endif
  1008 +      <hbox id="addonbar-closebutton"/>
   840 +#endif
  1009 +      <statusbar id="status-bar"/>
   841 +
       
   842 +
       
   843 +    <toolbar id="TabsToolbar"
       
   844 +             class="toolbar-primary"
       
   845 +             fullscreentoolbar="true"
       
   846 +             customizable="true"
       
   847 +             mode="icons" lockmode="true"
       
   848 +             iconsize="small" defaulticonsize="small" lockiconsize="true"
       
   849 +             aria-label="&tabsToolbar.label;"
       
   850 +             context="toolbar-context-menu"
       
   851 +#ifdef APPMENU_ON_TABBAR
       
   852 +             defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
       
   853 +#else
       
   854 +             defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
       
   855 +#endif
       
   856 +             collapsed="true">
       
   857 +
       
   858 +#ifdef APPMENU_ON_TABBAR
       
   859 +      <toolbarbutton id="appmenu-toolbar-button"
       
   860 +                     class="chromeclass-toolbar-additional"
       
   861 +                     type="menu"
       
   862 +                     label="&brandShortName;"
       
   863 +                     tooltiptext="&appMenuButton.tooltip;">
       
   864 +#include browser-appmenu.inc
       
   865 +      </toolbarbutton>
       
   866 +#endif
       
   867 +
       
   868 +      <tabs id="tabbrowser-tabs"
       
   869 +            class="tabbrowser-tabs"
       
   870 +            tabbrowser="content"
       
   871 +            flex="1"
       
   872 +            setfocus="false"
       
   873 +            tooltip="tabbrowser-tab-tooltip"
       
   874 +            stopwatchid="FX_TAB_CLICK_MS">
       
   875 +        <tab class="tabbrowser-tab" selected="true" fadein="true"/>
       
   876 +      </tabs>
       
   877 +
       
   878 +      <toolbarbutton id="new-tab-button"
       
   879 +                     class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   880 +                     label="&tabCmd.label;"
       
   881 +                     command="cmd_newNavigatorTab"
       
   882 +                     onclick="checkForMiddleClick(this, event);"
       
   883 +                     tooltiptext="&newTabButton.tooltip;"
       
   884 +                     ondrop="newTabButtonObserver.onDrop(event)"
       
   885 +                     ondragover="newTabButtonObserver.onDragOver(event)"
       
   886 +                     ondragenter="newTabButtonObserver.onDragOver(event)"
       
   887 +                     ondragexit="newTabButtonObserver.onDragExit(event)"
       
   888 +                     removable="true"/>
       
   889 +
       
   890 +      <toolbarbutton id="alltabs-button"
       
   891 +                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button"
       
   892 +                     type="menu"
       
   893 +                     label="&listAllTabs.label;"
       
   894 +                     tooltiptext="&listAllTabs.label;"
       
   895 +                     removable="true">
       
   896 +        <menupopup id="alltabs-popup"
       
   897 +                   position="after_end">
       
   898 +          <menuitem id="menu_tabview"
       
   899 +                    class="menuitem-iconic"
       
   900 +                    key="key_tabview"
       
   901 +                    label="&viewTabGroups.label;"
       
   902 +                    command="Browser:ToggleTabView"
       
   903 +                    observes="tabviewGroupsNumber"/>
       
   904 +          <menuseparator id="alltabs-popup-separator"/>
       
   905 +        </menupopup>
       
   906 +      </toolbarbutton>
       
   907 +
       
   908 +      <toolbarbutton id="tabs-closebutton"
       
   909 +                     class="close-button tabs-closebutton"
       
   910 +                     command="cmd_close"
       
   911 +                     label="&closeTab.label;"
       
   912 +                     tooltiptext="&closeTab.label;"/>
       
   913 +
       
   914 +#ifdef CAN_DRAW_IN_TITLEBAR
       
   915 +      <hbox class="titlebar-placeholder" type="appmenu-button" ordinal="0"/>
       
   916 +      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"/>
       
   917 +#endif
       
   918 +    </toolbar>
  1010 +    </toolbar>
   919 +
  1011 +
   920 +    <toolbarpalette id="BrowserToolbarPalette">
  1012 +    <toolbarpalette id="BrowserToolbarPalette">
   921 +
  1013 +
   922 +# Update primaryToolbarButtons in browser/themes/shared/browser.inc when adding
  1014 +# Update primaryToolbarButtons in browser/themes/shared/browser.inc when adding
   923 +# or removing default items with the toolbarbutton-1 class.
  1015 +# or removing default items with the toolbarbutton-1 class.
   924 +
  1016 +
   925 +      <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
  1017 +      <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
   926 +                     label="&printButton.label;" command="cmd_print"
  1018 +#ifdef XP_MACOSX
   927 +                     tooltiptext="&printButton.tooltip;"/>
  1019 +                     command="cmd_print" tooltip="dynamic-shortcut-tooltip"
   928 +
  1020 +#else
   929 +      <!-- This is a placeholder for the Downloads Indicator.  It is visible
  1021 +                     command="cmd_printPreview" tooltiptext="&printButton.tooltip;"
   930 +           during the customization of the toolbar, in the palette, and before
  1022 +#endif
   931 +           the Downloads Indicator overlay is loaded. -->
  1023 +                     label="&printButton.label;"/>
   932 +      <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
  1024 +
   933 +                     oncommand="DownloadsIndicatorView.onCommand(event);"
       
   934 +                     ondrop="DownloadsIndicatorView.onDrop(event);"
       
   935 +                     ondragover="DownloadsIndicatorView.onDragOver(event);"
       
   936 +                     ondragenter="DownloadsIndicatorView.onDragOver(event);"
       
   937 +                     label="&downloads.label;"
       
   938 +                     tooltiptext="&downloads.tooltip;"/>
       
   939 +
       
   940 +      <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   941 +                     observes="viewHistorySidebar" label="&historyButton.label;"
       
   942 +                     tooltiptext="&historyButton.tooltip;"/>
       
   943 +
       
   944 +      <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   945 +                     observes="viewBookmarksSidebar"
       
   946 +                     tooltiptext="&bookmarksButton.tooltip;"
       
   947 +                     ondrop="bookmarksButtonObserver.onDrop(event)"
       
   948 +                     ondragover="bookmarksButtonObserver.onDragOver(event)"
       
   949 +                     ondragenter="bookmarksButtonObserver.onDragOver(event)"
       
   950 +                     ondragexit="bookmarksButtonObserver.onDragExit(event)"/>
       
   951 +
  1025 +
   952 +      <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
  1026 +      <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
   953 +                     label="&newNavigatorCmd.label;"
  1027 +                     label="&newNavigatorCmd.label;"
   954 +                     command="key_newNavigator"
  1028 +                     command="key_newNavigator"
   955 +                     tooltiptext="&newWindowButton.tooltip;"
  1029 +                     tooltip="dynamic-shortcut-tooltip"
   956 +                     ondrop="newWindowButtonObserver.onDrop(event)"
  1030 +                     ondrop="newWindowButtonObserver.onDrop(event)"
   957 +                     ondragover="newWindowButtonObserver.onDragOver(event)"
  1031 +                     ondragover="newWindowButtonObserver.onDragOver(event)"
   958 +                     ondragenter="newWindowButtonObserver.onDragOver(event)"
  1032 +                     ondragenter="newWindowButtonObserver.onDragOver(event)"
   959 +                     ondragexit="newWindowButtonObserver.onDragExit(event)"/>
  1033 +                     ondragexit="newWindowButtonObserver.onDragExit(event)"/>
   960 +
  1034 +
   961 +      <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
  1035 +      <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
   962 +                     observes="View:FullScreen"
  1036 +                     observes="View:FullScreen"
   963 +                     type="checkbox"
  1037 +                     type="checkbox"
   964 +                     label="&fullScreenCmd.label;"
  1038 +                     label="&fullScreenCmd.label;"
   965 +                     tooltiptext="&fullScreenButton.tooltip;"/>
  1039 +                     tooltip="dynamic-shortcut-tooltip"/>
   966 +
       
   967 +      <toolbaritem id="zoom-controls" class="chromeclass-toolbar-additional"
       
   968 +                   title="&zoomControls.label;">
       
   969 +        <toolbarbutton id="zoom-out-button" class="toolbarbutton-1"
       
   970 +                       label="&fullZoomReduceCmd.label;"
       
   971 +                       command="cmd_fullZoomReduce"
       
   972 +                       tooltiptext="&zoomOutButton.tooltip;"/>
       
   973 +        <toolbarbutton id="zoom-in-button" class="toolbarbutton-1"
       
   974 +                       label="&fullZoomEnlargeCmd.label;"
       
   975 +                       command="cmd_fullZoomEnlarge"
       
   976 +                       tooltiptext="&zoomInButton.tooltip;"/>
       
   977 +      </toolbaritem>
       
   978 +
       
   979 +      <toolbarbutton id="feed-button"
       
   980 +                     type="menu"
       
   981 +                     class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   982 +                     disabled="true"
       
   983 +                     label="&feedButton.label;"
       
   984 +                     tooltiptext="&feedButton.tooltip;"
       
   985 +                     onclick="return FeedHandler.onFeedButtonClick(event);">
       
   986 +        <menupopup position="after_end"
       
   987 +                   id="feed-menu"
       
   988 +                   onpopupshowing="return FeedHandler.buildFeedList(this);"
       
   989 +                   oncommand="return FeedHandler.subscribeToFeed(null, event);"
       
   990 +                   onclick="checkForMiddleClick(this, event);"/>
       
   991 +      </toolbarbutton>
       
   992 +
       
   993 +      <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   994 +                     label="&cutCmd.label;"
       
   995 +                     command="cmd_cut"
       
   996 +                     tooltiptext="&cutButton.tooltip;"/>
       
   997 +
       
   998 +      <toolbarbutton id="copy-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   999 +                     label="&copyCmd.label;"
       
  1000 +                     command="cmd_copy"
       
  1001 +                     tooltiptext="&copyButton.tooltip;"/>
       
  1002 +
       
  1003 +      <toolbarbutton id="paste-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
  1004 +                     label="&pasteCmd.label;"
       
  1005 +                     command="cmd_paste"
       
  1006 +                     tooltiptext="&pasteButton.tooltip;"/>
       
  1007 +
  1040 +
  1008 +#ifdef MOZ_SERVICES_SYNC
  1041 +#ifdef MOZ_SERVICES_SYNC
  1009 +      <toolbarbutton id="sync-button"
  1042 +      <toolbarbutton id="sync-button"
  1010 +                     class="toolbarbutton-1 chromeclass-toolbar-additional"
  1043 +                     class="toolbarbutton-1 chromeclass-toolbar-additional"
  1011 +                     label="&syncToolbarButton.label;"
  1044 +                     label="&syncToolbarButton.label;"
  1012 +                     oncommand="gSyncUI.handleToolbarButton()"/>
  1045 +                     oncommand="gSyncUI.handleToolbarButton()"/>
  1013 +#endif
  1046 +#endif
  1014 +
  1047 +
  1015 +      <toolbaritem id="navigator-throbber" title="&throbberItem.title;" align="center" pack="center"
       
  1016 +                   mousethrough="always">
       
  1017 +        <image/>
       
  1018 +      </toolbaritem>
       
  1019 +
       
  1020 +      <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
  1048 +      <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
  1021 +                     label="&tabGroupsButton.label;"
  1049 +                     label="&tabGroupsButton.label;"
  1022 +                     command="Browser:ToggleTabView"
  1050 +                     command="Browser:ToggleTabView"
  1023 +                     tooltiptext="&tabGroupsButton.tooltip;"
  1051 +                     tooltip="dynamic-shortcut-tooltip"
  1024 +                     observes="tabviewGroupsNumber"/>
  1052 +                     observes="tabviewGroupsNumber"/>
  1025 +    </toolbarpalette>
  1053 +    </toolbarpalette>
  1026 +  </toolbox>
  1054 +  </toolbox>
  1027 +
  1055 +
  1028 +  <hbox id="fullscr-toggler" collapsed="true"/>
  1056 +  <hbox id="fullscr-toggler" collapsed="true"/>
  1029 +
  1057 +
  1030 +  <hbox flex="1" id="browser">
  1058 +  <deck id="content-deck" flex="1">
  1031 +    <vbox id="browser-border-start" hidden="true" layer="true"/>
  1059 +    <hbox flex="1" id="browser">
  1032 +    <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
  1060 +      <vbox id="browser-border-start" hidden="true" layer="true"/>
  1033 +      <sidebarheader id="sidebar-header" align="center">
  1061 +      <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
  1034 +        <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
  1062 +        <sidebarheader id="sidebar-header" align="center">
  1035 +        <image id="sidebar-throbber"/>
  1063 +          <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
  1036 +        <toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
  1064 +          <image id="sidebar-throbber"/>
  1037 +      </sidebarheader>
  1065 +          <toolbarbutton class="tabs-closebutton close-icon" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
  1038 +      <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
  1066 +        </sidebarheader>
  1039 +                style="min-width: 14em; width: 18em; max-width: 36em;"/>
  1067 +        <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
  1040 +    </vbox>
  1068 +                  style="min-width: 14em; width: 18em; max-width: 36em;"/>
  1041 +
  1069 +      </vbox>
  1042 +    <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
  1070 +
  1043 +    <vbox id="appcontent" flex="1">
  1071 +      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
  1044 +      <tabbrowser id="content"
  1072 +      <vbox id="appcontent" flex="1">
  1045 +                  flex="1" contenttooltip="aHTMLTooltip"
  1073 +        <tabbrowser id="content"
  1046 +                  tabcontainer="tabbrowser-tabs"
  1074 +                    flex="1" contenttooltip="aHTMLTooltip"
  1047 +                  contentcontextmenu="contentAreaContextMenu"
  1075 +                    tabcontainer="tabbrowser-tabs"
  1048 +                  autocompletepopup="PopupAutoComplete"
  1076 +                    contentcontextmenu="contentAreaContextMenu"
  1049 +                  selectpopup="ContentSelectDropdown"/>
  1077 +                    autocompletepopup="PopupAutoComplete"
  1050 +      <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
  1078 +                    selectpopup="ContentSelectDropdown"
  1051 +    </vbox>
  1079 +                    onclick="contentAreaClick(event, false);"/>
  1052 +    <splitter id="social-sidebar-splitter"
  1080 +        <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
  1053 +              class="chromeclass-extrachrome sidebar-splitter"
  1081 +      </vbox>
  1054 +              observes="socialSidebarBroadcaster"/>
  1082 +      <splitter id="social-sidebar-splitter"
  1055 +    <vbox id="social-sidebar-box"
  1083 +                class="chromeclass-extrachrome sidebar-splitter"
  1056 +          class="chromeclass-extrachrome"
  1084 +                observes="socialSidebarBroadcaster"/>
  1057 +          observes="socialSidebarBroadcaster"
  1085 +      <vbox id="social-sidebar-box"
  1058 +          persist="width">
  1086 +            class="chromeclass-extrachrome"
  1059 +      <browser id="social-sidebar-browser"
  1087 +            observes="socialSidebarBroadcaster"
  1060 +               type="content"
  1088 +            persist="width">
  1061 +               context="contentAreaContextMenu"
  1089 +
  1062 +               disableglobalhistory="true"
  1090 +        <sidebarheader id="social-sidebar-header" class="sidebar-header" align="center">
  1063 +               tooltip="aHTMLTooltip"
  1091 +          <image id="social-sidebar-favico"/>
  1064 +               popupnotificationanchor="social-notification-icon"
  1092 +          <label id="social-sidebar-title" class="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
  1065 +               flex="1"
  1093 +          <toolbarbutton id="social-sidebar-button"
  1066 +               style="min-width: 14em; width: 18em; max-width: 36em;"/>
  1094 +                         class="toolbarbutton-1"
  1067 +    </vbox>
  1095 +                         type="menu">
  1068 +    <vbox id="browser-border-end" hidden="true" layer="true"/>
  1096 +            <menupopup id="social-statusarea-popup" position="after_end">
  1069 +  </hbox>
  1097 +              <menuitem class="social-toggle-sidebar-menuitem"
       
  1098 +                        type="checkbox"
       
  1099 +                        autocheck="false"
       
  1100 +                        command="Social:ToggleSidebar"
       
  1101 +                        label="&social.toggleSidebar.label;"
       
  1102 +                        accesskey="&social.toggleSidebar.accesskey;"/>
       
  1103 +              <menuitem class="social-toggle-notifications-menuitem"
       
  1104 +                        type="checkbox"
       
  1105 +                        autocheck="false"
       
  1106 +                        command="Social:ToggleNotifications"
       
  1107 +                        label="&social.toggleNotifications.label;"
       
  1108 +                        accesskey="&social.toggleNotifications.accesskey;"/>
       
  1109 +              <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
       
  1110 +              <menuseparator/>
       
  1111 +              <menuseparator class="social-provider-menu" hidden="true"/>
       
  1112 +              <menuitem class="social-addons-menuitem" command="Social:Addons"
       
  1113 +                        label="&social.addons.label;"/>
       
  1114 +              <menuitem label="&social.learnMore.label;"
       
  1115 +                        accesskey="&social.learnMore.accesskey;"
       
  1116 +                        oncommand="SocialUI.showLearnMore();"/>
       
  1117 +            </menupopup>
       
  1118 +          </toolbarbutton>
       
  1119 +        </sidebarheader>
       
  1120 +
       
  1121 +        <browser id="social-sidebar-browser"
       
  1122 +                 type="content"
       
  1123 +                 context="contentAreaContextMenu"
       
  1124 +                 disableglobalhistory="true"
       
  1125 +                 tooltip="aHTMLTooltip"
       
  1126 +                 popupnotificationanchor="social-sidebar-favico"
       
  1127 +                 flex="1"
       
  1128 +                 style="min-width: 14em; width: 18em; max-width: 36em;"/>
       
  1129 +      </vbox>
       
  1130 +      <vbox id="browser-border-end" hidden="true" layer="true"/>
       
  1131 +    </hbox>
       
  1132 +#include ../../components/customizableui/content/customizeMode.inc.xul
       
  1133 +  </deck>
  1070 +
  1134 +
  1071 +  <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
  1135 +  <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
  1072 +    <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
  1136 +    <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
  1073 +      <vbox id="full-screen-warning-message" align="center">
  1137 +      <vbox id="full-screen-warning-message" align="center">
  1074 +        <description id="full-screen-domain-text"/>
  1138 +        <description id="full-screen-domain-text"/>
  1120 +                         class="devtools-closebutton"
  1184 +                         class="devtools-closebutton"
  1121 +                         oncommand="DeveloperToolbar.hide();"
  1185 +                         oncommand="DeveloperToolbar.hide();"
  1122 +                         tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
  1186 +                         tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
  1123 +#endif
  1187 +#endif
  1124 +   </toolbar>
  1188 +   </toolbar>
  1125 +
       
  1126 +    <toolbar id="addon-bar"
       
  1127 +             toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;"
       
  1128 +             collapsed="true"
       
  1129 +             class="toolbar-primary chromeclass-toolbar"
       
  1130 +             context="toolbar-context-menu" toolboxid="navigator-toolbox"
       
  1131 +             mode="icons" iconsize="small" defaulticonsize="small"
       
  1132 +             lockiconsize="true"
       
  1133 +             defaultset="addonbar-closebutton,spring,status-bar"
       
  1134 +             customizable="true"
       
  1135 +             key="key_toggleAddonBar">
       
  1136 +      <toolbarbutton id="addonbar-closebutton"
       
  1137 +                     tooltiptext="&addonBarCloseButton.tooltip;"
       
  1138 +                     oncommand="setToolbarVisibility(this.parentNode, false);"/>
       
  1139 +      <statusbar id="status-bar" ordinal="1000"/>
       
  1140 +    </toolbar>
       
  1141 +  </vbox>
  1189 +  </vbox>
  1142 +
  1190 +
       
  1191 +  <svg:svg height="0">
       
  1192 +#include tab-shape.inc.svg
       
  1193 +
  1143 +#ifndef XP_UNIX
  1194 +#ifndef XP_UNIX
  1144 +  <svg:svg height="0">
  1195 +    <svg:clipPath id="windows-keyhole-forward-clip-path" clipPathUnits="userSpaceOnUse">
  1145 +    <svg:clipPath id="windows-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
  1196 +      <svg:path d="M 0,0 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/>
  1146 +      <svg:path d="M 0,0 C 0.16,0.11 0.28,0.29 0.28,0.5 0.28,0.71 0.16,0.89 0,1 L 1,1 1,0 0,0 z"/>
       
  1147 +    </svg:clipPath>
  1197 +    </svg:clipPath>
  1148 +    <svg:clipPath id="windows-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
  1198 +    <svg:clipPath id="windows-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
  1149 +      <svg:path d="M 0,0 0,7.8 C 2.5,11 4,14 4,18 4,22 2.5,25 0,28 l 0,22 10000,0 0,-50 L 0,0 z"/>
  1199 +      <svg:path d="M -1,1 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/>
  1150 +    </svg:clipPath>
  1200 +    </svg:clipPath>
  1151 +  </svg:svg>
       
  1152 +#endif
  1201 +#endif
  1153 +#ifdef XP_MACOSX
  1202 +#ifdef XP_MACOSX
  1154 +  <svg:svg height="0">
  1203 +    <svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="userSpaceOnUse">
  1155 +    <svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
  1204 +      <svg:path d="M 0,0 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/>
  1156 +      <svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/>
       
  1157 +    </svg:clipPath>
  1205 +    </svg:clipPath>
  1158 +    <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
  1206 +    <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
  1159 +      <svg:path d="m 0,-5 0,4.03 C 3.6,1.8 6,6.1 6,11 6,16 3.6,20 0,23 l 0,27 10000,0 0,-55 L 0,-5 z"/>
  1207 +      <svg:path d="M -12,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/>
  1160 +    </svg:clipPath>
  1208 +    </svg:clipPath>
  1161 +    <svg:clipPath id="osx-tab-ontop-left-curve-clip-path" clipPathUnits="userSpaceOnUse">
  1209 +#endif
  1162 +      <svg:path d="M 9,0 C 7.3,0 6,1.3 6,3 l 0,14 c 0,3 -2.2,5 -5,5 l -1,0 0,1 12,0 0,-1 0,-19 0,-3 -3,0 z"/>
       
  1163 +    </svg:clipPath>
       
  1164 +    <svg:clipPath id="osx-tab-ontop-right-curve-clip-path" clipPathUnits="userSpaceOnUse">
       
  1165 +      <svg:path d="m 0,0 0,3 0,19 0,1 12,0 0,-1 -1,0 C 8.2,22 6,20 6,17 L 6,3 C 6,1.3 4.7,0 3,0 L 0,0 z"/>
       
  1166 +    </svg:clipPath>
       
  1167 +    <svg:clipPath id="osx-tab-onbottom-left-curve-clip-path" clipPathUnits="userSpaceOnUse">
       
  1168 +      <svg:path d="m 0,0 0,1 1,0 c 2.8,0 5,2.2 5,5 l 0,14 c 0,2 1.3,3 3,3 l 3,0 0,-3 L 12,1 12,0 0,0 z"/>
       
  1169 +    </svg:clipPath>
       
  1170 +    <svg:clipPath id="osx-tab-onbottom-right-curve-clip-path" clipPathUnits="userSpaceOnUse">
       
  1171 +      <svg:path d="m 0,0 0,1 0,19 0,3 3,0 c 1.7,0 3,-1 3,-3 L 6,6 C 6,3.2 8.2,1 11,1 L 12,1 12,0 0,0 z"/>
       
  1172 +    </svg:clipPath>
       
  1173 +  </svg:svg>
  1210 +  </svg:svg>
  1174 +#endif
       
  1175 +
  1211 +
  1176 +</vbox>
  1212 +</vbox>
  1177 +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
  1213 +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
  1178 +#     Introducing the iframe dynamically, as needed, was found to be better than
  1214 +#     Introducing the iframe dynamically, as needed, was found to be better than
  1179 +#     starting with an empty iframe here in browser.xul from a Ts standpoint.
  1215 +#     starting with an empty iframe here in browser.xul from a Ts standpoint.
  1181 +
  1217 +
  1182 +</window>
  1218 +</window>
  1183 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
  1219 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
  1184 --- a/browser/base/jar.mn
  1220 --- a/browser/base/jar.mn
  1185 +++ b/browser/base/jar.mn
  1221 +++ b/browser/base/jar.mn
  1186 @@ -53,16 +53,18 @@ browser.jar:
  1222 @@ -66,16 +66,18 @@ browser.jar:
  1187  #endif
       
  1188          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
  1223          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
  1189          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
  1224          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
  1190          content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
  1225          content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
       
  1226          content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
  1191          content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
  1227          content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
  1192  *       content/browser/browser.css                   (content/browser.css)
  1228  *       content/browser/browser.css                   (content/browser.css)
  1193  *       content/browser/browser.js                    (content/browser.js)
  1229  *       content/browser/browser.js                    (content/browser.js)
  1194  *       content/browser/browser.xul                   (content/browser.xul)
  1230  *       content/browser/browser.xul                   (content/browser.xul)
  1195 +*       content/browser/browser-kde.xul               (content/browser-kde.xul)
  1231 +*       content/browser/browser-kde.xul               (content/browser-kde.xul)
  1763 +
  1799 +
  1764 +#endif // nsunixshellservice_h____
  1800 +#endif // nsunixshellservice_h____
  1765 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
  1801 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
  1766 --- a/browser/installer/package-manifest.in
  1802 --- a/browser/installer/package-manifest.in
  1767 +++ b/browser/installer/package-manifest.in
  1803 +++ b/browser/installer/package-manifest.in
  1768 @@ -640,19 +640,21 @@
  1804 @@ -654,19 +654,21 @@
  1769  @BINPATH@/defaults/autoconfig/prefcalls.js
  1805  @BINPATH@/defaults/autoconfig/prefcalls.js
  1770  @BINPATH@/browser/defaults/profile/prefs.js
  1806  @BINPATH@/browser/defaults/profile/prefs.js
  1771  
  1807  
  1772  #ifndef LIBXUL_SDK
  1808  #ifndef LIBXUL_SDK
  1773  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
  1809  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)