firefox-kde.patch
branchfirefox69
changeset 1106 6c6375987b6c
parent 1099 8a3c73e74e65
child 1111 97a6da6d7e29
equal deleted inserted replaced
1105:611baabe5b83 1106:6c6375987b6c
     9 2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
     9 2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
    10 3. Find editBookmarkPanelDoneButton
    10 3. Find editBookmarkPanelDoneButton
    11 4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)
    11 4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)
    12 5. hg qrefresh
    12 5. hg qrefresh
    13 
    13 
    14 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
       
    15 new file mode 100644
       
    16 --- /dev/null
       
    17 +++ b/browser/base/content/browser-kde.xul
       
    18 @@ -0,0 +1,1375 @@
       
    19 +#filter substitution
       
    20 +<?xml version="1.0"?>
       
    21 +# -*- Mode: HTML -*-
       
    22 +#
       
    23 +# This Source Code Form is subject to the terms of the Mozilla Public
       
    24 +# License, v. 2.0. If a copy of the MPL was not distributed with this
       
    25 +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
       
    26 +
       
    27 +<!-- The "global.css" stylesheet is imported first to allow other stylesheets to
       
    28 +     override rules using selectors with the same specificity. This applies to
       
    29 +     both "content" and "skin" packages, which bug 1385444 will unify later. -->
       
    30 +<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
       
    31 +
       
    32 +<!-- While these stylesheets are defined in Toolkit, they are only used in the
       
    33 +     main browser window, so we can load them here. Bug 1474241 is on file to
       
    34 +     consider moving these widgets to the "browser" folder. -->
       
    35 +<?xml-stylesheet href="chrome://global/content/tabprompts.css" type="text/css"?>
       
    36 +<?xml-stylesheet href="chrome://global/skin/tabprompts.css" type="text/css"?>
       
    37 +
       
    38 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
       
    39 +<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>
       
    40 +<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css" type="text/css"?>
       
    41 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
       
    42 +<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
       
    43 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
       
    44 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
       
    45 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
       
    46 +<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css" type="text/css"?>
       
    47 +<?xml-stylesheet href="chrome://browser/skin/searchbar.css" type="text/css"?>
       
    48 +<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>
       
    49 +<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?>
       
    50 +
       
    51 +# All DTD information is stored in a separate file so that it can be shared by
       
    52 +# hiddenWindow.xul.
       
    53 +<!DOCTYPE window [
       
    54 +#include browser-doctype.inc
       
    55 +]>
       
    56 +
       
    57 +<window id="main-window"
       
    58 +        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
       
    59 +        xmlns:svg="http://www.w3.org/2000/svg"
       
    60 +        xmlns:html="http://www.w3.org/1999/xhtml"
       
    61 +        xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       
    62 +        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       
    63 +        title="&mainWindow.title;"
       
    64 +        title_normal="&mainWindow.title;"
       
    65 +#ifdef XP_MACOSX
       
    66 +        title_privatebrowsing="&mainWindow.title;&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
       
    67 +        titledefault="&mainWindow.title;"
       
    68 +        titlemodifier=""
       
    69 +        titlemodifier_normal=""
       
    70 +        titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"
       
    71 +#else
       
    72 +        title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
       
    73 +        titlemodifier="&mainWindow.titlemodifier;"
       
    74 +        titlemodifier_normal="&mainWindow.titlemodifier;"
       
    75 +        titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
       
    76 +#endif
       
    77 +#ifdef XP_WIN
       
    78 +        chromemargin="0,2,2,2"
       
    79 +#else
       
    80 +        chromemargin="0,-1,-1,-1"
       
    81 +#endif
       
    82 +        tabsintitlebar="true"
       
    83 +        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
       
    84 +        windowtype="navigator:browser"
       
    85 +        macanimationtype="document"
       
    86 +        screenX="4" screenY="4"
       
    87 +        fullscreenbutton="true"
       
    88 +        sizemode="normal"
       
    89 +        retargetdocumentfocus="urlbar"
       
    90 +        persist="screenX screenY width height sizemode"
       
    91 +#ifdef BROWSER_XHTML
       
    92 +        mozpersist=""
       
    93 +#endif
       
    94 +        >
       
    95 +
       
    96 +# All JS files which are needed by browser.xul and other top level windows to
       
    97 +# support MacOS specific features *must* go into the global-scripts.inc file so
       
    98 +# that they can be shared with macWindow.inc.xul.
       
    99 +#include global-scripts.inc
       
   100 +
       
   101 +<script>
       
   102 +  Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
       
   103 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-captivePortal.js", this);
       
   104 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-contentblocking.js", this);
       
   105 +#ifdef MOZ_DATA_REPORTING
       
   106 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-data-submission-info-bar.js", this);
       
   107 +#endif
       
   108 +#ifndef MOZILLA_OFFICIAL
       
   109 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-development-helpers.js", this);
       
   110 +#endif
       
   111 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-media.js", this);
       
   112 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-pageActions.js", this);
       
   113 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-plugins.js", this);
       
   114 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-sidebar.js", this);
       
   115 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-tabsintitlebar.js", this);
       
   116 +  Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);
       
   117 +  Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);
       
   118 +  Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
       
   119 +
       
   120 +  window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
       
   121 +  window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
       
   122 +  window.onclose = WindowIsClosing;
       
   123 +
       
   124 +  window.addEventListener("MozBeforeInitialXULLayout",
       
   125 +    gBrowserInit.onBeforeInitialXULLayout.bind(gBrowserInit), { once: true });
       
   126 +
       
   127 +  // The listener of DOMContentLoaded must be set on window, rather than
       
   128 +  // document, because the window can go away before the event is fired.
       
   129 +  // In that case, we don't want to initialize anything, otherwise we
       
   130 +  // may be leaking things because they will never be destroyed after.
       
   131 +  window.addEventListener("DOMContentLoaded",
       
   132 +    gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });
       
   133 +</script>
       
   134 +
       
   135 +# All sets except for popupsets (commands, keys, and stringbundles)
       
   136 +# *must* go into the browser-sets.inc file so that they can be shared with other
       
   137 +# top level windows in macWindow.inc.xul.
       
   138 +#include browser-sets.inc
       
   139 +
       
   140 +  <popupset id="mainPopupSet">
       
   141 +    <menupopup id="tabContextMenu"
       
   142 +               onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);"
       
   143 +               onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
       
   144 +      <menuitem id="context_reloadTab" data-lazy-l10n-id="reload-tab"
       
   145 +                oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
       
   146 +      <menuitem id="context_reloadSelectedTabs" data-lazy-l10n-id="reload-tabs" hidden="true"
       
   147 +                oncommand="gBrowser.reloadMultiSelectedTabs();"/>
       
   148 +      <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>
       
   149 +      <menuitem id="context_toggleMuteSelectedTabs" hidden="true"
       
   150 +                oncommand="gBrowser.toggleMuteAudioOnMultiSelectedTabs(TabContextMenu.contextTab);"/>
       
   151 +      <menuitem id="context_pinTab" data-lazy-l10n-id="pin-tab"
       
   152 +                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
       
   153 +      <menuitem id="context_unpinTab" data-lazy-l10n-id="unpin-tab" hidden="true"
       
   154 +                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
       
   155 +      <menuitem id="context_pinSelectedTabs" data-lazy-l10n-id="pin-selected-tabs" hidden="true"
       
   156 +                oncommand="gBrowser.pinMultiSelectedTabs();"/>
       
   157 +      <menuitem id="context_unpinSelectedTabs" data-lazy-l10n-id="unpin-selected-tabs" hidden="true"
       
   158 +                oncommand="gBrowser.unpinMultiSelectedTabs();"/>
       
   159 +      <menuitem id="context_duplicateTab" data-lazy-l10n-id="duplicate-tab"
       
   160 +                oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
       
   161 +      <menuitem id="context_duplicateTabs" data-lazy-l10n-id="duplicate-tabs"
       
   162 +                oncommand="TabContextMenu.duplicateSelectedTabs();"/>
       
   163 +      <menuseparator/>
       
   164 +      <menuitem id="context_selectAllTabs" data-lazy-l10n-id="select-all-tabs"
       
   165 +                oncommand="gBrowser.selectAllTabs();"/>
       
   166 +      <menuitem id="context_bookmarkSelectedTabs"
       
   167 +                hidden="true"
       
   168 +                data-lazy-l10n-id="bookmark-selected-tabs"
       
   169 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"/>
       
   170 +      <menuitem id="context_bookmarkTab"
       
   171 +                data-lazy-l10n-id="bookmark-tab"
       
   172 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.getUniquePages([TabContextMenu.contextTab]));"/>
       
   173 +      <menu id="context_reopenInContainer"
       
   174 +            data-lazy-l10n-id="reopen-in-container"
       
   175 +            hidden="true">
       
   176 +        <menupopup oncommand="TabContextMenu.reopenInContainer(event);"
       
   177 +                   onpopupshowing="TabContextMenu.createReopenInContainerMenu(event);"/>
       
   178 +      </menu>
       
   179 +      <menu id="context_moveTabOptions">
       
   180 +        <menupopup id="moveTabOptionsMenu">
       
   181 +          <menuitem id="context_moveToStart"
       
   182 +                    data-lazy-l10n-id="move-to-start"
       
   183 +                    tbattr="tabbrowser-multiple"
       
   184 +                    oncommand="gBrowser.moveTabsToStart(TabContextMenu.contextTab);"/>
       
   185 +          <menuitem id="context_moveToEnd"
       
   186 +                    data-lazy-l10n-id="move-to-end"
       
   187 +                    tbattr="tabbrowser-multiple"
       
   188 +                    oncommand="gBrowser.moveTabsToEnd(TabContextMenu.contextTab);"/>
       
   189 +          <menuitem id="context_openTabInWindow" data-lazy-l10n-id="move-to-new-window"
       
   190 +                    tbattr="tabbrowser-multiple"
       
   191 +                    oncommand="gBrowser.replaceTabsWithWindow(TabContextMenu.contextTab);"/>
       
   192 +        </menupopup>
       
   193 +      </menu>
       
   194 +      <menu id="context_sendTabToDevice"
       
   195 +            class="sync-ui-item">
       
   196 +        <menupopup id="context_sendTabToDevicePopupMenu"
       
   197 +                   onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle, TabContextMenu.contextTab.multiselected);"/>
       
   198 +      </menu>
       
   199 +      <menuseparator/>
       
   200 +      <menuitem id="context_closeTabsToTheEnd" data-lazy-l10n-id="close-tabs-to-the-end"
       
   201 +                oncommand="gBrowser.removeTabsToTheEndFrom(TabContextMenu.contextTab, {animate: true});"/>
       
   202 +      <menuitem id="context_closeOtherTabs" data-lazy-l10n-id="close-other-tabs"
       
   203 +                oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/>
       
   204 +      <menuitem id="context_undoCloseTab"
       
   205 +                data-lazy-l10n-id="undo-close-tab"
       
   206 +                observes="History:UndoCloseTab"/>
       
   207 +      <menuitem id="context_closeTab" data-lazy-l10n-id="close-tab"
       
   208 +                oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/>
       
   209 +      <menuitem id="context_closeSelectedTabs" data-lazy-l10n-id="close-tabs"
       
   210 +                hidden="true"
       
   211 +                oncommand="gBrowser.removeMultiSelectedTabs();"/>
       
   212 +    </menupopup>
       
   213 +
       
   214 +    <!-- bug 415444/582485: event.stopPropagation is here for the cloned version
       
   215 +         of this menupopup -->
       
   216 +    <menupopup id="backForwardMenu"
       
   217 +               onpopupshowing="return FillHistoryMenu(event.target);"
       
   218 +               oncommand="gotoHistoryIndex(event); event.stopPropagation();"
       
   219 +               onclick="checkForMiddleClick(this, event);"/>
       
   220 +    <tooltip id="aHTMLTooltip" page="true"/>
       
   221 +    <tooltip id="remoteBrowserTooltip"/>
       
   222 +
       
   223 +    <!-- for search and content formfill/pw manager -->
       
   224 +
       
   225 +    <panel is="autocomplete-richlistbox-popup"
       
   226 +           type="autocomplete-richlistbox"
       
   227 +           id="PopupAutoComplete"
       
   228 +           role="group"
       
   229 +           noautofocus="true"
       
   230 +           hidden="true"
       
   231 +           overflowpadding="4"
       
   232 +           norolluponanchor="true"
       
   233 +           nomaxresults="true" />
       
   234 +
       
   235 +    <!-- for search with one-off buttons -->
       
   236 +    <panel is="search-autocomplete-richlistbox-popup"
       
   237 +           type="autocomplete-richlistbox"
       
   238 +           id="PopupSearchAutoComplete"
       
   239 +           role="group"
       
   240 +           noautofocus="true"
       
   241 +           hidden="true" />
       
   242 +
       
   243 +    <!-- for url bar autocomplete -->
       
   244 +    <panel type="autocomplete-richlistbox"
       
   245 +           id="PopupAutoCompleteRichResult"
       
   246 +           role="group"
       
   247 +           noautofocus="true"
       
   248 +           hidden="true"
       
   249 +           flip="none"
       
   250 +           level="parent"
       
   251 +           overflowpadding="15" />
       
   252 +
       
   253 +    <!-- for date/time picker. consumeoutsideclicks is set to never, so that
       
   254 +         clicks on the anchored input box are never consumed. -->
       
   255 +    <panel id="DateTimePickerPanel"
       
   256 +           type="arrow"
       
   257 +           hidden="true"
       
   258 +           orient="vertical"
       
   259 +           noautofocus="true"
       
   260 +           norolluponanchor="true"
       
   261 +           consumeoutsideclicks="never"
       
   262 +           level="parent"
       
   263 +           tabspecific="true">
       
   264 +    </panel>
       
   265 +
       
   266 +    <!-- for select dropdowns. The menupopup is what shows the list of options,
       
   267 +         and the popuponly menulist makes things like the menuactive attributes
       
   268 +         work correctly on the menupopup. ContentSelectDropdown expects the
       
   269 +         popuponly menulist to be its immediate parent. -->
       
   270 +    <menulist popuponly="true" id="ContentSelectDropdown" hidden="true">
       
   271 +      <menupopup rolluponmousewheel="true"
       
   272 +                 activateontab="true" position="after_start"
       
   273 +                 level="parent"
       
   274 +#ifdef XP_WIN
       
   275 +                 consumeoutsideclicks="false" ignorekeys="shortcuts"
       
   276 +#endif
       
   277 +        />
       
   278 +    </menulist>
       
   279 +
       
   280 +    <!-- for invalid form error message -->
       
   281 +    <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent">
       
   282 +      <description/>
       
   283 +    </panel>
       
   284 +
       
   285 +    <panel id="editBookmarkPanel"
       
   286 +           type="arrow"
       
   287 +           orient="vertical"
       
   288 +           ignorekeys="true"
       
   289 +           hidden="true"
       
   290 +           tabspecific="true"
       
   291 +           aria-labelledby="editBookmarkPanelTitle">
       
   292 +      <box class="panel-header">
       
   293 +        <label id="editBookmarkPanelTitle"/>
       
   294 +        <toolbarbutton id="editBookmarkPanelInfoButton" oncommand="StarUI.toggleRecommendation();" >
       
   295 +          <image/>
       
   296 +        </toolbarbutton>
       
   297 +      </box>
       
   298 +      <html:div id="editBookmarkPanelInfoArea">
       
   299 +        <html:div id="editBookmarkPanelRecommendation"></html:div>
       
   300 +        <html:div id="editBookmarkPanelFaviconContainer">
       
   301 +          <html:img id="editBookmarkPanelFavicon"/>
       
   302 +        </html:div>
       
   303 +        <html:div id="editBookmarkPanelImage"></html:div>
       
   304 +      </html:div>
       
   305 +#include ../../components/places/content/editBookmarkPanel.inc.xul
       
   306 +      <vbox id="editBookmarkPanelBottomContent"
       
   307 +            flex="1">
       
   308 +        <checkbox id="editBookmarkPanel_showForNewBookmarks"
       
   309 +                  label="&editBookmark.showForNewBookmarks.label;"
       
   310 +                  accesskey="&editBookmark.showForNewBookmarks.accesskey;"
       
   311 +                  oncommand="StarUI.onShowForNewBookmarksCheckboxCommand();"/>
       
   312 +      </vbox>
       
   313 +      <hbox id="editBookmarkPanelBottomButtons"
       
   314 +            class="panel-footer"
       
   315 +            style="min-width: &editBookmark.panel.width;;">
       
   316 +#ifdef XP_UNIX
       
   317 +        <button id="editBookmarkPanelDoneButton"
       
   318 +                class="editBookmarkPanelBottomButton"
       
   319 +                label="&editBookmark.done.label;"
       
   320 +                default="true"
       
   321 +                oncommand="StarUI.panel.hidePopup();"/>
       
   322 +        <button id="editBookmarkPanelRemoveButton"
       
   323 +                class="editBookmarkPanelBottomButton"
       
   324 +                oncommand="StarUI.removeBookmarkButtonCommand();"/>
       
   325 +#else
       
   326 +        <button id="editBookmarkPanelRemoveButton"
       
   327 +                class="editBookmarkPanelBottomButton"
       
   328 +                oncommand="StarUI.removeBookmarkButtonCommand();"/>
       
   329 +        <button id="editBookmarkPanelDoneButton"
       
   330 +                class="editBookmarkPanelBottomButton"
       
   331 +                label="&editBookmark.done.label;"
       
   332 +                default="true"
       
   333 +                oncommand="StarUI.panel.hidePopup();"/>
       
   334 +#endif
       
   335 +      </hbox>
       
   336 +    </panel>
       
   337 +
       
   338 +    <!-- UI tour experience -->
       
   339 +    <panel id="UITourTooltip"
       
   340 +           type="arrow"
       
   341 +           hidden="true"
       
   342 +           noautofocus="true"
       
   343 +           noautohide="true"
       
   344 +           align="start"
       
   345 +           orient="vertical"
       
   346 +           role="alert">
       
   347 +     <vbox>
       
   348 +      <hbox id="UITourTooltipBody">
       
   349 +        <image id="UITourTooltipIcon"/>
       
   350 +        <vbox flex="1">
       
   351 +          <hbox id="UITourTooltipTitleContainer">
       
   352 +            <label id="UITourTooltipTitle" flex="1"/>
       
   353 +            <toolbarbutton id="UITourTooltipClose" class="close-icon"
       
   354 +                           tooltiptext="&uiTour.infoPanel.close;"/>
       
   355 +          </hbox>
       
   356 +          <description id="UITourTooltipDescription" flex="1"/>
       
   357 +        </vbox>
       
   358 +      </hbox>
       
   359 +      <hbox id="UITourTooltipButtons" flex="1" align="center"/>
       
   360 +     </vbox>
       
   361 +    </panel>
       
   362 +    <!-- type="default" forces frames to be created so that the panel's size can be determined -->
       
   363 +    <panel id="UITourHighlightContainer"
       
   364 +           type="default"
       
   365 +           hidden="true"
       
   366 +           noautofocus="true"
       
   367 +           noautohide="true"
       
   368 +           flip="none"
       
   369 +           consumeoutsideclicks="false"
       
   370 +           mousethrough="always">
       
   371 +      <box id="UITourHighlight"></box>
       
   372 +    </panel>
       
   373 +
       
   374 +    <panel id="sidebarMenu-popup"
       
   375 +           class="cui-widget-panel"
       
   376 +           role="group"
       
   377 +           type="arrow"
       
   378 +           hidden="true"
       
   379 +           flip="slide"
       
   380 +           orient="vertical"
       
   381 +           position="bottomcenter topleft">
       
   382 +      <toolbarbutton id="sidebar-switcher-bookmarks"
       
   383 +                     type="checkbox"
       
   384 +                     label="&bookmarksButton.label;"
       
   385 +                     class="subviewbutton subviewbutton-iconic"
       
   386 +                     key="viewBookmarksSidebarKb"
       
   387 +                     oncommand="SidebarUI.show('viewBookmarksSidebar');"/>
       
   388 +      <toolbarbutton id="sidebar-switcher-history"
       
   389 +                     type="checkbox"
       
   390 +                     label="&historyButton.label;"
       
   391 +                     class="subviewbutton subviewbutton-iconic"
       
   392 +                     key="key_gotoHistory"
       
   393 +                     oncommand="SidebarUI.show('viewHistorySidebar');"/>
       
   394 +      <toolbarbutton id="sidebar-switcher-tabs"
       
   395 +                     type="checkbox"
       
   396 +                     label="&syncedTabs.sidebar.label;"
       
   397 +                     class="subviewbutton subviewbutton-iconic sync-ui-item"
       
   398 +                     oncommand="SidebarUI.show('viewTabsSidebar');"/>
       
   399 +      <toolbarseparator/>
       
   400 +      <!-- Extension toolbarbuttons go here. -->
       
   401 +      <toolbarseparator id="sidebar-extensions-separator"/>
       
   402 +      <toolbarbutton id="sidebar-reverse-position"
       
   403 +                     class="subviewbutton"
       
   404 +                     oncommand="SidebarUI.reversePosition()"/>
       
   405 +      <toolbarseparator/>
       
   406 +      <toolbarbutton label="&sidebarMenuClose.label;"
       
   407 +                     class="subviewbutton"
       
   408 +                     oncommand="SidebarUI.hide()"/>
       
   409 +    </panel>
       
   410 +
       
   411 +    <menupopup id="toolbar-context-menu"
       
   412 +               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator')); ToolbarContextMenu.updateDownloadsAutoHide(this); ToolbarContextMenu.updateExtension(this)">
       
   413 +      <menuitem oncommand="ToolbarContextMenu.openAboutAddonsForContextAction(this.parentElement)"
       
   414 +                accesskey="&customizeMenu.manageExtension.accesskey;"
       
   415 +                label="&customizeMenu.manageExtension.label;"
       
   416 +                contexttype="toolbaritem"
       
   417 +                class="customize-context-manageExtension"/>
       
   418 +      <menuitem oncommand="ToolbarContextMenu.removeExtensionForContextAction(this.parentElement)"
       
   419 +                accesskey="&customizeMenu.removeExtension.accesskey;"
       
   420 +                label="&customizeMenu.removeExtension.label;"
       
   421 +                contexttype="toolbaritem"
       
   422 +                class="customize-context-removeExtension"/>
       
   423 +      <menuitem oncommand="ToolbarContextMenu.reportExtensionForContextAction(this.parentElement, 'toolbar_context_menu')"
       
   424 +                accesskey="&customizeMenu.reportExtension.accesskey;"
       
   425 +                label="&customizeMenu.reportExtension.label;"
       
   426 +                contexttype="toolbaritem"
       
   427 +                class="customize-context-reportExtension"/>
       
   428 +      <menuseparator/>
       
   429 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
       
   430 +                accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
       
   431 +                label="&customizeMenu.pinToOverflowMenu.label;"
       
   432 +                contexttype="toolbaritem"
       
   433 +                class="customize-context-moveToPanel"/>
       
   434 +      <menuitem id="toolbar-context-autohide-downloads-button"
       
   435 +                oncommand="ToolbarContextMenu.onDownloadsAutoHideChange(event);"
       
   436 +                type="checkbox"
       
   437 +                accesskey="&customizeMenu.autoHideDownloadsButton.accesskey;"
       
   438 +                label="&customizeMenu.autoHideDownloadsButton.label;"
       
   439 +                contexttype="toolbaritem"/>
       
   440 +      <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
       
   441 +                accesskey="&customizeMenu.removeFromToolbar.accesskey;"
       
   442 +                label="&customizeMenu.removeFromToolbar.label;"
       
   443 +                contexttype="toolbaritem"
       
   444 +                class="customize-context-removeFromToolbar"/>
       
   445 +      <menuitem id="toolbar-context-reloadSelectedTab"
       
   446 +                contexttype="tabbar"
       
   447 +                oncommand="gBrowser.reloadMultiSelectedTabs();"
       
   448 +                data-lazy-l10n-id="toolbar-context-menu-reload-selected-tab"/>
       
   449 +      <menuitem id="toolbar-context-reloadSelectedTabs"
       
   450 +                contexttype="tabbar"
       
   451 +                oncommand="gBrowser.reloadMultiSelectedTabs();"
       
   452 +                data-lazy-l10n-id="toolbar-context-menu-reload-selected-tabs"/>
       
   453 +      <menuitem id="toolbar-context-bookmarkSelectedTab"
       
   454 +                contexttype="tabbar"
       
   455 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
       
   456 +                data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tab"/>
       
   457 +      <menuitem id="toolbar-context-bookmarkSelectedTabs"
       
   458 +                contexttype="tabbar"
       
   459 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
       
   460 +                data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tabs"/>
       
   461 +      <menuitem id="toolbar-context-selectAllTabs"
       
   462 +                contexttype="tabbar"
       
   463 +                oncommand="gBrowser.selectAllTabs();"
       
   464 +                data-lazy-l10n-id="toolbar-context-menu-select-all-tabs"/>
       
   465 +      <menuitem id="toolbar-context-undoCloseTab"
       
   466 +                contexttype="tabbar"
       
   467 +                data-lazy-l10n-id="toolbar-context-menu-undo-close-tab"
       
   468 +                observes="History:UndoCloseTab"/>
       
   469 +      <menuseparator/>
       
   470 +      <menuseparator id="viewToolbarsMenuSeparator"/>
       
   471 +      <!-- XXXgijs: we're using oncommand handler here to avoid the event being
       
   472 +                    redirected to the command element, thus preventing
       
   473 +                    listeners on the menupopup or further up the tree from
       
   474 +                    seeing the command event pass by. The observes attribute is
       
   475 +                    here so that the menuitem is still disabled and re-enabled
       
   476 +                    correctly. -->
       
   477 +      <menuitem oncommand="gCustomizeMode.enter()"
       
   478 +                observes="cmd_CustomizeToolbars"
       
   479 +                class="viewCustomizeToolbar"
       
   480 +                label="&viewCustomizeToolbar.label;"
       
   481 +                accesskey="&viewCustomizeToolbar.accesskey;"/>
       
   482 +    </menupopup>
       
   483 +
       
   484 +    <menupopup id="blockedPopupOptions"
       
   485 +               onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"
       
   486 +               onpopuphiding="gPopupBlockerObserver.onPopupHiding(event);">
       
   487 +      <menuitem id="blockedPopupAllowSite"
       
   488 +                accesskey="&allowPopups.accesskey;"
       
   489 +                oncommand="gPopupBlockerObserver.toggleAllowPopupsForSite(event);"/>
       
   490 +      <menuitem
       
   491 +#ifdef XP_WIN
       
   492 +                label="&editPopupSettings.label;"
       
   493 +#else
       
   494 +                label="&editPopupSettingsUnix.label;"
       
   495 +#endif
       
   496 +                accesskey="&editPopupSettings.accesskey;"
       
   497 +                oncommand="gPopupBlockerObserver.editPopupSettings();"/>
       
   498 +      <menuitem id="blockedPopupDontShowMessage"
       
   499 +                accesskey="&dontShowMessage.accesskey;"
       
   500 +                type="checkbox"
       
   501 +                oncommand="gPopupBlockerObserver.dontShowMessage();"/>
       
   502 +      <menuseparator id="blockedPopupsSeparator"/>
       
   503 +    </menupopup>
       
   504 +
       
   505 +    <menupopup id="autohide-context"
       
   506 +           onpopupshowing="FullScreen.getAutohide(this.firstChild);">
       
   507 +      <menuitem type="checkbox" label="&fullScreenAutohide.label;"
       
   508 +                accesskey="&fullScreenAutohide.accesskey;"
       
   509 +                oncommand="FullScreen.setAutohide();"/>
       
   510 +      <menuseparator/>
       
   511 +      <menuitem label="&fullScreenExit.label;"
       
   512 +                accesskey="&fullScreenExit.accesskey;"
       
   513 +                oncommand="BrowserFullScreen();"/>
       
   514 +    </menupopup>
       
   515 +
       
   516 +    <menupopup id="contentAreaContextMenu" pagemenu="#page-menu-separator"
       
   517 +               onpopupshowing="if (event.target != this)
       
   518 +                                 return true;
       
   519 +                               gContextMenu = new nsContextMenu(this, event.shiftKey);
       
   520 +                               if (gContextMenu.shouldDisplay)
       
   521 +                                 updateEditUIVisibility();
       
   522 +                               return gContextMenu.shouldDisplay;"
       
   523 +               onpopuphiding="if (event.target != this)
       
   524 +                                return;
       
   525 +                              gContextMenu.hiding();
       
   526 +                              gContextMenu = null;
       
   527 +                              updateEditUIVisibility();">
       
   528 +#include browser-context.inc
       
   529 +    </menupopup>
       
   530 +
       
   531 +#include ../../components/places/content/placesContextMenu.inc.xul
       
   532 +
       
   533 +    <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top">
       
   534 +      <hbox id="ctrlTab-previews"/>
       
   535 +      <hbox id="ctrlTab-showAll-container" pack="center"/>
       
   536 +    </panel>
       
   537 +
       
   538 +    <panel id="pageActionPanel"
       
   539 +           class="cui-widget-panel"
       
   540 +           role="group"
       
   541 +           type="arrow"
       
   542 +           hidden="true"
       
   543 +           flip="slide"
       
   544 +           photon="true"
       
   545 +           position="bottomcenter topright"
       
   546 +           tabspecific="true"
       
   547 +           noautofocus="true"
       
   548 +           pinTab-title="&pinTab.label;"
       
   549 +           unpinTab-title="&unpinTab.label;"
       
   550 +           pocket-title="&saveToPocketCmd.label;"
       
   551 +           copyURL-title="&pageAction.copyLink.label;"
       
   552 +           emailLink-title="&emailPageCmd.label;"
       
   553 +           sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;"
       
   554 +           shareURL-title="&pageAction.shareUrl.label;"
       
   555 +           shareMore-label="&pageAction.shareMore.label;">
       
   556 +      <panelmultiview id="pageActionPanelMultiView"
       
   557 +                      mainViewId="pageActionPanelMainView"
       
   558 +                      viewCacheId="appMenu-viewCache">
       
   559 +        <panelview id="pageActionPanelMainView"
       
   560 +                   context="pageActionContextMenu"
       
   561 +                   class="PanelUI-subView">
       
   562 +          <vbox class="panel-subview-body"/>
       
   563 +        </panelview>
       
   564 +      </panelmultiview>
       
   565 +    </panel>
       
   566 +
       
   567 +    <panel id="confirmation-hint"
       
   568 +           role="alert"
       
   569 +           type="arrow"
       
   570 +           hidden="true"
       
   571 +           flip="slide"
       
   572 +           position="bottomcenter topright"
       
   573 +           tabspecific="true"
       
   574 +           noautofocus="true">
       
   575 +      <hbox id="confirmation-hint-checkmark-animation-container">
       
   576 +       <image id="confirmation-hint-checkmark-image"/>
       
   577 +      </hbox>
       
   578 +      <vbox id="confirmation-hint-message-container">
       
   579 +       <label id="confirmation-hint-message"/>
       
   580 +       <label id="confirmation-hint-description"/>
       
   581 +      </vbox>
       
   582 +    </panel>
       
   583 +
       
   584 +    <menupopup id="pageActionContextMenu"
       
   585 +               onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);">
       
   586 +      <menuitem class="pageActionContextMenuItem builtInUnpinned"
       
   587 +                label="&pageAction.addToUrlbar.label;"
       
   588 +                oncommand="BrowserPageActions.togglePinningForContextAction();"/>
       
   589 +      <menuitem class="pageActionContextMenuItem builtInPinned"
       
   590 +                label="&pageAction.removeFromUrlbar.label;"
       
   591 +                oncommand="BrowserPageActions.togglePinningForContextAction();"/>
       
   592 +      <menuitem class="pageActionContextMenuItem extensionUnpinned"
       
   593 +                label="&pageAction.addToUrlbar.label;"
       
   594 +                oncommand="BrowserPageActions.togglePinningForContextAction();"/>
       
   595 +      <menuitem class="pageActionContextMenuItem extensionPinned"
       
   596 +                label="&pageAction.removeFromUrlbar.label;"
       
   597 +                oncommand="BrowserPageActions.togglePinningForContextAction();"/>
       
   598 +      <menuseparator class="pageActionContextMenuItem extensionPinned extensionUnpinned"/>
       
   599 +      <menuitem class="pageActionContextMenuItem extensionPinned extensionUnpinned"
       
   600 +                label="&pageAction.manageExtension.label;"
       
   601 +                oncommand="BrowserPageActions.openAboutAddonsForContextAction();"/>
       
   602 +    </menupopup>
       
   603 +
       
   604 +#include ../../components/places/content/bookmarksHistoryTooltip.inc.xul
       
   605 +
       
   606 +    <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
       
   607 +
       
   608 +    <tooltip id="back-button-tooltip">
       
   609 +      <description class="tooltip-label" value="&backButton.tooltip;"/>
       
   610 +#ifdef XP_MACOSX
       
   611 +      <description class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/>
       
   612 +#else
       
   613 +      <description class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
       
   614 +#endif
       
   615 +    </tooltip>
       
   616 +
       
   617 +    <tooltip id="forward-button-tooltip">
       
   618 +      <description class="tooltip-label" value="&forwardButton.tooltip;"/>
       
   619 +#ifdef XP_MACOSX
       
   620 +      <description class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/>
       
   621 +#else
       
   622 +      <description class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
       
   623 +#endif
       
   624 +    </tooltip>
       
   625 +
       
   626 +#include popup-notifications.inc
       
   627 +
       
   628 +#include ../../components/customizableui/content/panelUI.inc.xul
       
   629 +#include ../../components/controlcenter/content/identityPanel.inc.xul
       
   630 +#include ../../components/controlcenter/content/protectionsPanel.inc.xul
       
   631 +#include ../../components/downloads/content/downloadsPanel.inc.xul
       
   632 +#include browser-allTabsMenu.inc.xul
       
   633 +
       
   634 +    <hbox id="downloads-animation-container" mousethrough="always">
       
   635 +      <vbox id="downloads-notification-anchor" hidden="true">
       
   636 +        <vbox id="downloads-indicator-notification"/>
       
   637 +      </vbox>
       
   638 +    </hbox>
       
   639 +
       
   640 +    <tooltip id="dynamic-shortcut-tooltip"
       
   641 +             onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
       
   642 +
       
   643 +    <menupopup id="SyncedTabsSidebarContext">
       
   644 +      <menuitem data-lazy-l10n-id="synced-tabs-context-open"
       
   645 +                id="syncedTabsOpenSelected" where="current"/>
       
   646 +      <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-tab"
       
   647 +                id="syncedTabsOpenSelectedInTab" where="tab"/>
       
   648 +      <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-window"
       
   649 +                id="syncedTabsOpenSelectedInWindow" where="window"/>
       
   650 +      <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-private-window"
       
   651 +                id="syncedTabsOpenSelectedInPrivateWindow" where="window" private="true"/>
       
   652 +      <menuseparator/>
       
   653 +      <menuitem data-lazy-l10n-id="synced-tabs-context-bookmark-single-tab"
       
   654 +                id="syncedTabsBookmarkSelected"/>
       
   655 +      <menuitem data-lazy-l10n-id="synced-tabs-context-copy"
       
   656 +                id="syncedTabsCopySelected"/>
       
   657 +      <menuseparator/>
       
   658 +      <menuitem data-lazy-l10n-id="synced-tabs-context-open-all-in-tabs"
       
   659 +                id="syncedTabsOpenAllInTabs"/>
       
   660 +      <menuitem data-lazy-l10n-id="synced-tabs-context-manage-devices"
       
   661 +                id="syncedTabsManageDevices"
       
   662 +                oncommand="gSync.openDevicesManagementPage('syncedtabs-sidebar');"/>
       
   663 +      <menuitem label="&syncSyncNowItem.label;"
       
   664 +                accesskey="&syncSyncNowItem.accesskey;"
       
   665 +                id="syncedTabsRefresh"/>
       
   666 +    </menupopup>
       
   667 +    <menupopup id="SyncedTabsSidebarTabsFilterContext"
       
   668 +               class="textbox-contextmenu">
       
   669 +      <menuitem label="&undoCmd.label;"
       
   670 +                accesskey="&undoCmd.accesskey;"
       
   671 +                cmd="cmd_undo"/>
       
   672 +      <menuseparator/>
       
   673 +      <menuitem label="&cutCmd.label;"
       
   674 +                accesskey="&cutCmd.accesskey;"
       
   675 +                cmd="cmd_cut"/>
       
   676 +      <menuitem label="&copyCmd.label;"
       
   677 +                accesskey="&copyCmd.accesskey;"
       
   678 +                cmd="cmd_copy"/>
       
   679 +      <menuitem label="&pasteCmd.label;"
       
   680 +                accesskey="&pasteCmd.accesskey;"
       
   681 +                cmd="cmd_paste"/>
       
   682 +      <menuitem label="&deleteCmd.label;"
       
   683 +                accesskey="&deleteCmd.accesskey;"
       
   684 +                cmd="cmd_delete"/>
       
   685 +      <menuseparator/>
       
   686 +      <menuitem label="&selectAllCmd.label;"
       
   687 +                accesskey="&selectAllCmd.accesskey;"
       
   688 +                cmd="cmd_selectAll"/>
       
   689 +      <menuseparator/>
       
   690 +      <menuitem label="&syncSyncNowItem.label;"
       
   691 +                accesskey="&syncSyncNowItem.accesskey;"
       
   692 +                id="syncedTabsRefreshFilter"/>
       
   693 +    </menupopup>
       
   694 +
       
   695 +    <hbox id="statuspanel" inactive="true" renderroot="content">
       
   696 +      <hbox id="statuspanel-inner">
       
   697 +        <label id="statuspanel-label"
       
   698 +               role="status"
       
   699 +               aria-live="off"
       
   700 +               flex="1"
       
   701 +               crop="end"/>
       
   702 +      </hbox>
       
   703 +    </hbox>
       
   704 +  </popupset>
       
   705 +  <box id="appMenu-viewCache" hidden="true"/>
       
   706 +
       
   707 +  <toolbox id="navigator-toolbox">
       
   708 +
       
   709 +    <vbox id="titlebar">
       
   710 +      <!-- Menu -->
       
   711 +      <toolbar type="menubar" id="toolbar-menubar"
       
   712 +               class="browser-toolbar chromeclass-menubar titlebar-color"
       
   713 +               customizable="true"
       
   714 +               mode="icons"
       
   715 +#ifdef MENUBAR_CAN_AUTOHIDE
       
   716 +               toolbarname="&menubarCmd.label;"
       
   717 +               accesskey="&menubarCmd.accesskey;"
       
   718 +               autohide="true"
       
   719 +#endif
       
   720 +               context="toolbar-context-menu">
       
   721 +        <toolbaritem id="menubar-items" align="center">
       
   722 +# The entire main menubar is placed into browser-menubar.inc, so that it can be
       
   723 +# shared with other top level windows in macWindow.inc.xul.
       
   724 +#include browser-menubar.inc
       
   725 +        </toolbaritem>
       
   726 +        <spacer flex="1" skipintoolbarset="true" ordinal="1000"/>
       
   727 +#include titlebar-items.inc.xul
       
   728 +      </toolbar>
       
   729 +
       
   730 +      <toolbar id="TabsToolbar"
       
   731 +               class="browser-toolbar titlebar-color"
       
   732 +               fullscreentoolbar="true"
       
   733 +               customizable="true"
       
   734 +               customizationtarget="TabsToolbar-customization-target"
       
   735 +               mode="icons"
       
   736 +               aria-label="&tabsToolbar.label;"
       
   737 +               context="toolbar-context-menu"
       
   738 +               flex="1">
       
   739 +
       
   740 +        <hbox class="titlebar-spacer" type="pre-tabs"/>
       
   741 +
       
   742 +        <hbox flex="1" align="end" class="toolbar-items">
       
   743 +          <hbox id="TabsToolbar-customization-target" flex="1">
       
   744 +            <tabs id="tabbrowser-tabs"
       
   745 +                  flex="1"
       
   746 +                  setfocus="false"
       
   747 +                  tooltip="tabbrowser-tab-tooltip"
       
   748 +                  stopwatchid="FX_TAB_CLICK_MS">
       
   749 +              <tab class="tabbrowser-tab" selected="true" visuallyselected="true" fadein="true"/>
       
   750 +            </tabs>
       
   751 +
       
   752 +            <toolbarbutton id="new-tab-button"
       
   753 +                           class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   754 +                           label="&tabCmd.label;"
       
   755 +                           command="cmd_newNavigatorTab"
       
   756 +                           onclick="checkForMiddleClick(this, event);"
       
   757 +                           tooltip="dynamic-shortcut-tooltip"
       
   758 +                           ondrop="newTabButtonObserver.onDrop(event)"
       
   759 +                           ondragover="newTabButtonObserver.onDragOver(event)"
       
   760 +                           ondragenter="newTabButtonObserver.onDragOver(event)"
       
   761 +                           ondragexit="newTabButtonObserver.onDragExit(event)"
       
   762 +                           cui-areatype="toolbar"
       
   763 +                           removable="true"/>
       
   764 +
       
   765 +            <toolbarbutton id="alltabs-button"
       
   766 +                           class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button badged-button"
       
   767 +                           oncommand="gTabsPanel.showAllTabsPanel();"
       
   768 +                           label="&listAllTabs.label;"
       
   769 +                           tooltiptext="&listAllTabs.label;"
       
   770 +                           removable="false"/>
       
   771 +          </hbox>
       
   772 +        </hbox>
       
   773 +
       
   774 +        <hbox class="titlebar-spacer" type="post-tabs"/>
       
   775 +
       
   776 +#ifndef XP_MACOSX
       
   777 +        <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
       
   778 +                aria-live="polite"/>
       
   779 +        <hbox class="private-browsing-indicator"/>
       
   780 +#endif
       
   781 +
       
   782 +#include titlebar-items.inc.xul
       
   783 +
       
   784 +#ifdef XP_MACOSX
       
   785 +        <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary
       
   786 +             buttonbox from reversing order in RTL by forcing an LTR direction. -->
       
   787 +        <hbox id="titlebar-secondary-buttonbox" dir="ltr">
       
   788 +          <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" aria-live="polite"/>
       
   789 +          <hbox class="private-browsing-indicator"/>
       
   790 +          <hbox id="titlebar-fullscreen-button"/>
       
   791 +        </hbox>
       
   792 +#endif
       
   793 +      </toolbar>
       
   794 +
       
   795 +    </vbox>
       
   796 +
       
   797 +    <toolbar id="nav-bar"
       
   798 +             class="browser-toolbar"
       
   799 +             aria-label="&navbarCmd.label;"
       
   800 +             fullscreentoolbar="true" mode="icons" customizable="true"
       
   801 +             customizationtarget="nav-bar-customization-target"
       
   802 +             overflowable="true"
       
   803 +             overflowbutton="nav-bar-overflow-button"
       
   804 +             overflowtarget="widget-overflow-list"
       
   805 +             overflowpanel="widget-overflow"
       
   806 +             context="toolbar-context-menu">
       
   807 +
       
   808 +      <toolbartabstop/>
       
   809 +      <hbox id="nav-bar-customization-target" flex="1">
       
   810 +        <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   811 +                       label="&backCmd.label;"
       
   812 +                       removable="false" overflows="false"
       
   813 +                       keepbroadcastattributeswhencustomizing="true"
       
   814 +                       command="Browser:BackOrBackDuplicate"
       
   815 +                       onclick="checkForMiddleClick(this, event);"
       
   816 +                       tooltip="back-button-tooltip"
       
   817 +                       context="backForwardMenu"/>
       
   818 +        <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   819 +                       label="&forwardCmd.label;"
       
   820 +                       removable="false" overflows="false"
       
   821 +                       keepbroadcastattributeswhencustomizing="true"
       
   822 +                       command="Browser:ForwardOrForwardDuplicate"
       
   823 +                       onclick="checkForMiddleClick(this, event);"
       
   824 +                       tooltip="forward-button-tooltip"
       
   825 +                       context="backForwardMenu"/>
       
   826 +        <toolbaritem id="stop-reload-button" class="chromeclass-toolbar-additional"
       
   827 +                     title="&reloadCmd.label;"
       
   828 +                     removable="true" overflows="false">
       
   829 +          <toolbarbutton id="reload-button" class="toolbarbutton-1"
       
   830 +                         label="&reloadCmd.label;"
       
   831 +                         command="Browser:ReloadOrDuplicate"
       
   832 +                         onclick="checkForMiddleClick(this, event);"
       
   833 +                         tooltip="dynamic-shortcut-tooltip">
       
   834 +            <box class="toolbarbutton-animatable-box">
       
   835 +              <image class="toolbarbutton-animatable-image"/>
       
   836 +            </box>
       
   837 +          </toolbarbutton>
       
   838 +          <toolbarbutton id="stop-button" class="toolbarbutton-1"
       
   839 +                         label="&stopCmd.label;"
       
   840 +                         command="Browser:Stop"
       
   841 +                         tooltip="dynamic-shortcut-tooltip">
       
   842 +            <box class="toolbarbutton-animatable-box">
       
   843 +              <image class="toolbarbutton-animatable-image"/>
       
   844 +            </box>
       
   845 +          </toolbarbutton>
       
   846 +        </toolbaritem>
       
   847 +        <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
   848 +                       removable="true"
       
   849 +                       label="&homeButton.label;"
       
   850 +                       ondragover="homeButtonObserver.onDragOver(event)"
       
   851 +                       ondragenter="homeButtonObserver.onDragOver(event)"
       
   852 +                       ondrop="homeButtonObserver.onDrop(event)"
       
   853 +                       ondragexit="homeButtonObserver.onDragExit(event)"
       
   854 +                       key="goHome"
       
   855 +                       onclick="BrowserHome(event);"
       
   856 +                       cui-areatype="toolbar"
       
   857 +                       tooltiptext="&homeButton.defaultPage.tooltip;"/>
       
   858 +        <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
       
   859 +        <toolbaritem id="urlbar-container" flex="400" persist="width"
       
   860 +                     removable="false"
       
   861 +                     class="chromeclass-location" overflows="false">
       
   862 +            <toolbartabstop/>
       
   863 +            <textbox id="urlbar" flex="1"
       
   864 +                     placeholder="&urlbar.placeholder2;"
       
   865 +                     defaultPlaceholder="&urlbar.placeholder2;"
       
   866 +                     focused="true"
       
   867 +                     pageproxystate="invalid">
       
   868 +              <!-- Use onclick instead of normal popup= syntax since the popup
       
   869 +                   code fires onmousedown, and hence eats our favicon drag events. -->
       
   870 +              <box id="identity-box" role="button"
       
   871 +                   align="center"
       
   872 +                   aria-label="&urlbar.viewSiteInfo.label;"
       
   873 +                   onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
       
   874 +                   onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
       
   875 +                   ondragstart="gIdentityHandler.onDragStart(event);">
       
   876 +                <image id="identity-icon"
       
   877 +                       consumeanchor="identity-box"
       
   878 +                       onclick="PageProxyClickHandler(event);"/>
       
   879 +                <image id="sharing-icon" mousethrough="always"/>
       
   880 +                <box id="tracking-protection-icon-box" animationsenabled="true">
       
   881 +                  <image id="tracking-protection-icon"/>
       
   882 +                  <box id="tracking-protection-icon-animatable-box" flex="1">
       
   883 +                    <image id="tracking-protection-icon-animatable-image" flex="1"/>
       
   884 +                  </box>
       
   885 +                </box>
       
   886 +                <box id="blocked-permissions-container" align="center">
       
   887 +                  <image data-permission-id="geo" class="blocked-permission-icon geo-icon" role="button"
       
   888 +                         tooltiptext="&urlbar.geolocationBlocked.tooltip;"/>
       
   889 +                  <image data-permission-id="desktop-notification" class="blocked-permission-icon desktop-notification-icon" role="button"
       
   890 +                         tooltiptext="&urlbar.webNotificationsBlocked.tooltip;"/>
       
   891 +                  <image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button"
       
   892 +                         tooltiptext="&urlbar.cameraBlocked.tooltip;"/>
       
   893 +                  <image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button"
       
   894 +                         tooltiptext="&urlbar.microphoneBlocked.tooltip;"/>
       
   895 +                  <image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button"
       
   896 +                         tooltiptext="&urlbar.screenBlocked.tooltip;"/>
       
   897 +                  <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button"
       
   898 +                         tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/>
       
   899 +                  <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
       
   900 +                         tooltiptext="&urlbar.popupBlocked.tooltip;"/>
       
   901 +                  <image data-permission-id="autoplay-media" class="blocked-permission-icon autoplay-media-icon" role="button"
       
   902 +                         tooltiptext="&urlbar.autoplayMediaBlocked.tooltip;"/>
       
   903 +                  <image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button"
       
   904 +                         tooltiptext="&urlbar.canvasBlocked.tooltip;"/>
       
   905 +                  <image data-permission-id="plugin:flash" class="blocked-permission-icon plugin-icon" role="button"
       
   906 +                         tooltiptext="&urlbar.flashPluginBlocked.tooltip;"/>
       
   907 +                  <image data-permission-id="midi" class="blocked-permission-icon midi-icon" role="button"
       
   908 +                         tooltiptext="&urlbar.midiBlocked.tooltip;"/>
       
   909 +                  <image data-permission-id="install" class="blocked-permission-icon install-icon" role="button"
       
   910 +                         tooltiptext="&urlbar.installBlocked.tooltip;"/>
       
   911 +                </box>
       
   912 +                <box id="notification-popup-box"
       
   913 +                     hidden="true"
       
   914 +                     onmouseover="document.getElementById('identity-box').classList.add('no-hover');"
       
   915 +                     onmouseout="document.getElementById('identity-box').classList.remove('no-hover');"
       
   916 +                     align="center">
       
   917 +                  <image id="default-notification-icon" class="notification-anchor-icon" role="button"
       
   918 +                         tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
       
   919 +                  <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
       
   920 +                         tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/>
       
   921 +                  <image id="autoplay-media-notification-icon" class="notification-anchor-icon autoplay-media-icon" role="button"
       
   922 +                         tooltiptext="&urlbar.autoplayNotificationAnchor.tooltip;"/>
       
   923 +                  <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
       
   924 +                         tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/>
       
   925 +                  <image id="canvas-notification-icon" class="notification-anchor-icon" role="button"
       
   926 +                         tooltiptext="&urlbar.canvasNotificationAnchor.tooltip;"/>
       
   927 +                  <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
       
   928 +                         tooltiptext="&urlbar.indexedDBNotificationAnchor.tooltip;"/>
       
   929 +                  <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button"
       
   930 +                         tooltiptext="&urlbar.passwordNotificationAnchor.tooltip;"/>
       
   931 +                  <stack id="plugins-notification-icon" class="notification-anchor-icon" role="button" align="center"
       
   932 +                         tooltiptext="&urlbar.pluginsNotificationAnchor.tooltip;">
       
   933 +                    <image class="plugin-icon" />
       
   934 +                    <image id="plugin-icon-badge" />
       
   935 +                  </stack>
       
   936 +                  <image id="web-notifications-notification-icon" class="notification-anchor-icon desktop-notification-icon" role="button"
       
   937 +                         tooltiptext="&urlbar.webNotificationAnchor.tooltip;"/>
       
   938 +                  <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button"
       
   939 +                         tooltiptext="&urlbar.webRTCShareDevicesNotificationAnchor.tooltip;"/>
       
   940 +                  <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button"
       
   941 +                         tooltiptext="&urlbar.webRTCShareMicrophoneNotificationAnchor.tooltip;"/>
       
   942 +                  <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button"
       
   943 +                         tooltiptext="&urlbar.webRTCShareScreenNotificationAnchor.tooltip;"/>
       
   944 +                  <image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button"
       
   945 +                         tooltiptext="&urlbar.servicesNotificationAnchor.tooltip;"/>
       
   946 +                  <image id="translate-notification-icon" class="notification-anchor-icon translation-icon" role="button"
       
   947 +                         tooltiptext="&urlbar.translateNotificationAnchor.tooltip;"/>
       
   948 +                  <image id="translated-notification-icon" class="notification-anchor-icon translation-icon in-use" role="button"
       
   949 +                         tooltiptext="&urlbar.translatedNotificationAnchor.tooltip;"/>
       
   950 +                  <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button"
       
   951 +                         tooltiptext="&urlbar.emeNotificationAnchor.tooltip;"/>
       
   952 +                  <image id="persistent-storage-notification-icon" class="notification-anchor-icon persistent-storage-icon" role="button"
       
   953 +                         tooltiptext="&urlbar.persistentStorageNotificationAnchor.tooltip;"/>
       
   954 +                  <image id="midi-notification-icon" class="notification-anchor-icon midi-icon" role="button"
       
   955 +                         tooltiptext="&urlbar.midiNotificationAnchor.tooltip;"/>
       
   956 +                  <image id="webauthn-notification-icon" class="notification-anchor-icon" role="button"
       
   957 +                         tooltiptext="&urlbar.webAuthnAnchor.tooltip;"/>
       
   958 +                  <image id="storage-access-notification-icon" class="notification-anchor-icon storage-access-icon" role="button"
       
   959 +                         tooltiptext="&urlbar.storageAccessAnchor.tooltip;"/>
       
   960 +                </box>
       
   961 +                <image id="connection-icon"/>
       
   962 +                <image id="extension-icon"/>
       
   963 +                <image id="remote-control-icon"
       
   964 +                       tooltiptext="&urlbar.remoteControlNotificationAnchor.tooltip;"/>
       
   965 +                <hbox id="identity-icon-labels">
       
   966 +                  <label id="identity-icon-label" class="plain" flex="1"/>
       
   967 +                  <label id="identity-icon-country-label" class="plain"/>
       
   968 +                </hbox>
       
   969 +              </box>
       
   970 +              <box id="urlbar-display-box" align="center">
       
   971 +                <label id="switchtab" class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
       
   972 +                <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/>
       
   973 +              </box>
       
   974 +              <hbox id="page-action-buttons" context="pageActionContextMenu">
       
   975 +                <toolbartabstop/>
       
   976 +                <hbox id="contextual-feature-recommendation" role="button" hidden="true">
       
   977 +                  <hbox id="cfr-label-container">
       
   978 +                    <label id="cfr-label"/>
       
   979 +                  </hbox>
       
   980 +                  <image id="cfr-button"
       
   981 +                         class="urlbar-icon urlbar-page-action"
       
   982 +                         role="presentation"/>
       
   983 +                </hbox>
       
   984 +                <hbox id="userContext-icons" hidden="true">
       
   985 +                  <label id="userContext-label"/>
       
   986 +                  <image id="userContext-indicator"/>
       
   987 +                </hbox>
       
   988 +                <image id="reader-mode-button"
       
   989 +                       class="urlbar-icon urlbar-page-action"
       
   990 +                       tooltip="dynamic-shortcut-tooltip"
       
   991 +                       role="button"
       
   992 +                       hidden="true"
       
   993 +                       onclick="ReaderParent.buttonClick(event);"/>
       
   994 +                <toolbarbutton id="urlbar-zoom-button"
       
   995 +                       onclick="FullZoom.reset();"
       
   996 +                       tooltip="dynamic-shortcut-tooltip"
       
   997 +                       hidden="true"/>
       
   998 +                <box id="pageActionSeparator" class="urlbar-page-action"/>
       
   999 +                <image id="pageActionButton"
       
  1000 +                       class="urlbar-icon urlbar-page-action"
       
  1001 +                       role="button"
       
  1002 +                       tooltiptext="&pageActionButton.tooltip;"
       
  1003 +                       onmousedown="BrowserPageActions.mainButtonClicked(event);"
       
  1004 +                       onkeypress="BrowserPageActions.mainButtonClicked(event);"/>
       
  1005 +                <hbox id="pocket-button-box"
       
  1006 +                      hidden="true"
       
  1007 +                      class="urlbar-icon-wrapper urlbar-page-action"
       
  1008 +                      onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('pocket'), event, this);">
       
  1009 +                  <image id="pocket-button"
       
  1010 +                         class="urlbar-icon"
       
  1011 +                         tooltiptext="&pocketButton.tooltiptext;"
       
  1012 +                         role="button"/>
       
  1013 +                  <hbox id="pocket-button-animatable-box">
       
  1014 +                    <image id="pocket-button-animatable-image"
       
  1015 +                           tooltiptext="&pocketButton.tooltiptext;"
       
  1016 +                           role="presentation"/>
       
  1017 +                  </hbox>
       
  1018 +                </hbox>
       
  1019 +                <hbox id="star-button-box"
       
  1020 +                      hidden="true"
       
  1021 +                      class="urlbar-icon-wrapper urlbar-page-action"
       
  1022 +                      onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);">
       
  1023 +                  <image id="star-button"
       
  1024 +                         class="urlbar-icon"
       
  1025 +                         role="button"/>
       
  1026 +                  <hbox id="star-button-animatable-box">
       
  1027 +                    <image id="star-button-animatable-image"
       
  1028 +                           role="presentation"/>
       
  1029 +                  </hbox>
       
  1030 +                </hbox>
       
  1031 +              </hbox>
       
  1032 +            </textbox>
       
  1033 +            <toolbartabstop/>
       
  1034 +        </toolbaritem>
       
  1035 +
       
  1036 +        <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
       
  1037 +
       
  1038 +        <!-- This is a placeholder for the Downloads Indicator.  It is visible
       
  1039 +             during the customization of the toolbar, in the palette, and before
       
  1040 +             the Downloads Indicator overlay is loaded. -->
       
  1041 +        <toolbarbutton id="downloads-button"
       
  1042 +                       class="toolbarbutton-1 chromeclass-toolbar-additional badged-button"
       
  1043 +                       key="key_openDownloads"
       
  1044 +                       onmousedown="DownloadsIndicatorView.onCommand(event);"
       
  1045 +                       onkeypress="DownloadsIndicatorView.onCommand(event);"
       
  1046 +                       ondrop="DownloadsIndicatorView.onDrop(event);"
       
  1047 +                       ondragover="DownloadsIndicatorView.onDragOver(event);"
       
  1048 +                       ondragenter="DownloadsIndicatorView.onDragOver(event);"
       
  1049 +                       label="&downloads.label;"
       
  1050 +                       removable="true"
       
  1051 +                       overflows="false"
       
  1052 +                       cui-areatype="toolbar"
       
  1053 +                       hidden="true"
       
  1054 +                       tooltip="dynamic-shortcut-tooltip"
       
  1055 +                       indicator="true">
       
  1056 +            <!-- The panel's anchor area is smaller than the outer button, but must
       
  1057 +                 always be visible and must not move or resize when the indicator
       
  1058 +                 state changes, otherwise the panel could change its position or lose
       
  1059 +                 its arrow unexpectedly. -->
       
  1060 +            <stack id="downloads-indicator-anchor"
       
  1061 +                   consumeanchor="downloads-button">
       
  1062 +              <box id="downloads-indicator-icon"/>
       
  1063 +              <stack id="downloads-indicator-progress-outer">
       
  1064 +                <box id="downloads-indicator-progress-inner"/>
       
  1065 +              </stack>
       
  1066 +            </stack>
       
  1067 +          </toolbarbutton>
       
  1068 +
       
  1069 +        <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
       
  1070 +                       removable="true"
       
  1071 +                       onmousedown="PanelUI.showSubView('appMenu-libraryView', this, event);"
       
  1072 +                       onkeypress="PanelUI.showSubView('appMenu-libraryView', this, event);"
       
  1073 +                       closemenu="none"
       
  1074 +                       cui-areatype="toolbar"
       
  1075 +                       tooltiptext="&libraryButton.tooltip;"
       
  1076 +                       label="&places.library.title;"/>
       
  1077 +
       
  1078 +        <toolbarbutton id="fxa-toolbar-menu-button" class="toolbarbutton-1 badged-button chromeclass-toolbar-additional subviewbutton-nav"
       
  1079 +                       onmousedown="gSync.toggleAccountPanel('PanelUI-fxa', event)"
       
  1080 +                       onkeypress="gSync.toggleAccountPanel('PanelUI-fxa', event)"
       
  1081 +                       consumeanchor="fxa-toolbar-menu-button"
       
  1082 +                       closemenu="none"
       
  1083 +                       label="&fxa.menu.firefoxAccount;"
       
  1084 +                       tooltiptext="&fxa.menu.firefoxAccount;"
       
  1085 +                       cui-areatype="toolbar"
       
  1086 +                       removable="true">
       
  1087 +                       <vbox>
       
  1088 +                        <image id="fxa-avatar-image"/>
       
  1089 +                       </vbox>
       
  1090 +        </toolbarbutton>
       
  1091 +      </hbox>
       
  1092 +
       
  1093 +      <toolbarbutton id="nav-bar-overflow-button"
       
  1094 +                     class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
       
  1095 +                     skipintoolbarset="true"
       
  1096 +                     tooltiptext="&navbarOverflow.label;">
       
  1097 +        <box class="toolbarbutton-animatable-box">
       
  1098 +          <image class="toolbarbutton-animatable-image"/>
       
  1099 +        </box>
       
  1100 +      </toolbarbutton>
       
  1101 +
       
  1102 +      <toolbaritem id="PanelUI-button"
       
  1103 +                   removable="false">
       
  1104 +        <toolbarbutton id="PanelUI-menu-button"
       
  1105 +                       class="toolbarbutton-1 badged-button"
       
  1106 +                       consumeanchor="PanelUI-button"
       
  1107 +                       label="&brandShortName;"
       
  1108 +                       tooltiptext="&appmenu.tooltip;"/>
       
  1109 +      </toolbaritem>
       
  1110 +
       
  1111 +      <hbox id="window-controls" hidden="true" pack="end" skipintoolbarset="true"
       
  1112 +            ordinal="1000">
       
  1113 +        <toolbarbutton id="minimize-button"
       
  1114 +                       tooltiptext="&fullScreenMinimize.tooltip;"
       
  1115 +                       oncommand="window.minimize();"/>
       
  1116 +
       
  1117 +        <toolbarbutton id="restore-button"
       
  1118 +#ifdef XP_MACOSX
       
  1119 +# Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button
       
  1120 +# to exit fullscreen and want it to behave like other toolbar buttons.
       
  1121 +                       class="toolbarbutton-1"
       
  1122 +#endif
       
  1123 +                       tooltiptext="&fullScreenRestore.tooltip;"
       
  1124 +                       oncommand="BrowserFullScreen();"/>
       
  1125 +
       
  1126 +        <toolbarbutton id="close-button"
       
  1127 +                       tooltiptext="&fullScreenClose.tooltip;"
       
  1128 +                       oncommand="BrowserTryToCloseWindow();"/>
       
  1129 +      </hbox>
       
  1130 +
       
  1131 +      <box id="library-animatable-box" class="toolbarbutton-animatable-box">
       
  1132 +        <image class="toolbarbutton-animatable-image"/>
       
  1133 +      </box>
       
  1134 +    </toolbar>
       
  1135 +
       
  1136 +    <toolbar id="PersonalToolbar"
       
  1137 +             mode="icons"
       
  1138 +             class="browser-toolbar chromeclass-directories"
       
  1139 +             context="toolbar-context-menu"
       
  1140 +             toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
       
  1141 +             collapsed="true"
       
  1142 +             customizable="true">
       
  1143 +      <toolbartabstop skipintoolbarset="true"/>
       
  1144 +      <toolbaritem id="personal-bookmarks"
       
  1145 +                   title="&bookmarksToolbarItem.label;"
       
  1146 +                   cui-areatype="toolbar"
       
  1147 +                   removable="true">
       
  1148 +        <toolbarbutton id="bookmarks-toolbar-placeholder"
       
  1149 +                       class="bookmark-item"
       
  1150 +                       label="&bookmarksToolbarItem.label;"/>
       
  1151 +        <toolbarbutton id="bookmarks-toolbar-button"
       
  1152 +                       class="toolbarbutton-1"
       
  1153 +                       flex="1"
       
  1154 +                       label="&bookmarksToolbarItem.label;"
       
  1155 +                       oncommand="PlacesToolbarHelper.onPlaceholderCommand();"/>
       
  1156 +        <hbox flex="1"
       
  1157 +              id="PlacesToolbar"
       
  1158 +              context="placesContext"
       
  1159 +              onmouseup="BookmarksEventHandler.onMouseUp(event);"
       
  1160 +              onclick="BookmarksEventHandler.onClick(event, this._placesView);"
       
  1161 +              oncommand="BookmarksEventHandler.onCommand(event);"
       
  1162 +              tooltip="bhTooltip"
       
  1163 +              popupsinherittooltip="true">
       
  1164 +          <hbox flex="1">
       
  1165 +            <hbox id="PlacesToolbarDropIndicatorHolder" align="center" collapsed="true">
       
  1166 +              <image id="PlacesToolbarDropIndicator"
       
  1167 +                     mousethrough="always"
       
  1168 +                     collapsed="true"/>
       
  1169 +            </hbox>
       
  1170 +            <scrollbox orient="horizontal"
       
  1171 +                       id="PlacesToolbarItems"
       
  1172 +                       flex="1"/>
       
  1173 +            <toolbarbutton type="menu"
       
  1174 +                           id="PlacesChevron"
       
  1175 +                           class="toolbarbutton-1"
       
  1176 +                           mousethrough="never"
       
  1177 +                           collapsed="true"
       
  1178 +                           tooltiptext="&bookmarksToolbarChevron.tooltip;"
       
  1179 +                           onpopupshowing="document.getElementById('PlacesToolbar')
       
  1180 +                                                   ._placesView._onChevronPopupShowing(event);">
       
  1181 +              <menupopup id="PlacesChevronPopup"
       
  1182 +                         placespopup="true"
       
  1183 +                         tooltip="bhTooltip" popupsinherittooltip="true"
       
  1184 +                         context="placesContext"/>
       
  1185 +            </toolbarbutton>
       
  1186 +          </hbox>
       
  1187 +        </hbox>
       
  1188 +      </toolbaritem>
       
  1189 +    </toolbar>
       
  1190 +
       
  1191 +    <toolbarpalette id="BrowserToolbarPalette">
       
  1192 +
       
  1193 +      <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
  1194 +#ifdef XP_MACOSX
       
  1195 +                     command="cmd_print"
       
  1196 +                     tooltip="dynamic-shortcut-tooltip"
       
  1197 +#else
       
  1198 +                     command="cmd_printPreview"
       
  1199 +                     tooltiptext="&printButton.tooltip;"
       
  1200 +#endif
       
  1201 +                     label="&printButton.label;"/>
       
  1202 +
       
  1203 +
       
  1204 +      <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
  1205 +                     label="&newNavigatorCmd.label;"
       
  1206 +                     command="cmd_newNavigator"
       
  1207 +                     tooltip="dynamic-shortcut-tooltip"
       
  1208 +                     ondrop="newWindowButtonObserver.onDrop(event)"
       
  1209 +                     ondragover="newWindowButtonObserver.onDragOver(event)"
       
  1210 +                     ondragenter="newWindowButtonObserver.onDragOver(event)"
       
  1211 +                     ondragexit="newWindowButtonObserver.onDragExit(event)"/>
       
  1212 +
       
  1213 +      <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
       
  1214 +                     observes="View:FullScreen"
       
  1215 +                     type="checkbox"
       
  1216 +                     label="&fullScreenCmd.label;"
       
  1217 +                     tooltip="dynamic-shortcut-tooltip"/>
       
  1218 +
       
  1219 +      <toolbarbutton id="bookmarks-menu-button"
       
  1220 +                     class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
       
  1221 +                     type="menu"
       
  1222 +                     label="&bookmarksMenuButton2.label;"
       
  1223 +                     tooltip="dynamic-shortcut-tooltip"
       
  1224 +                     anchor="dropmarker"
       
  1225 +                     ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
       
  1226 +                     ondragover="PlacesMenuDNDHandler.onDragOver(event);"
       
  1227 +                     ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
       
  1228 +                     ondrop="PlacesMenuDNDHandler.onDrop(event);"
       
  1229 +                     oncommand="BookmarkingUI.onCommand(event);">
       
  1230 +        <menupopup id="BMB_bookmarksPopup"
       
  1231 +                   class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView"
       
  1232 +                   placespopup="true"
       
  1233 +                   context="placesContext"
       
  1234 +                   openInTabs="children"
       
  1235 +                   side="top"
       
  1236 +                   onmouseup="BookmarksEventHandler.onMouseUp(event);"
       
  1237 +                   oncommand="BookmarksEventHandler.onCommand(event);"
       
  1238 +                   onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
       
  1239 +                   onpopupshowing="BookmarkingUI.onPopupShowing(event);
       
  1240 +                                   BookmarkingUI.attachPlacesView(event, this);"
       
  1241 +                   tooltip="bhTooltip" popupsinherittooltip="true">
       
  1242 +          <menuitem id="BMB_viewBookmarksSidebar"
       
  1243 +                    class="menuitem-iconic subviewbutton"
       
  1244 +                    label-show="&viewBookmarksSidebar2.label;"
       
  1245 +                    label-hide="&hideBookmarksSidebar.label;"
       
  1246 +                    oncommand="SidebarUI.toggle('viewBookmarksSidebar');"/>
       
  1247 +          <!-- NB: temporary solution for bug 985024, this should go away soon. -->
       
  1248 +          <menuitem id="BMB_bookmarksShowAllTop"
       
  1249 +                    class="menuitem-iconic subviewbutton"
       
  1250 +                    label="&showAllBookmarks2.label;"
       
  1251 +                    command="Browser:ShowAllBookmarks"
       
  1252 +                    key="manBookmarkKb"/>
       
  1253 +          <menuseparator/>
       
  1254 +          <menu id="BMB_bookmarksToolbar"
       
  1255 +                class="menu-iconic bookmark-item subviewbutton"
       
  1256 +                label="&personalbarCmd.label;"
       
  1257 +                container="true">
       
  1258 +            <menupopup id="BMB_bookmarksToolbarPopup"
       
  1259 +                       placespopup="true"
       
  1260 +                       context="placesContext"
       
  1261 +                       onpopupshowing="if (!this.parentNode._placesView)
       
  1262 +                                         new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.toolbarGuid}`,
       
  1263 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);">
       
  1264 +              <menuitem id="BMB_viewBookmarksToolbar"
       
  1265 +                        class="menuitem-iconic subviewbutton"
       
  1266 +                        label-show="&viewBookmarksToolbar.label;"
       
  1267 +                        label-hide="&hideBookmarksToolbar.label;"
       
  1268 +                        oncommand="BookmarkingUI.toggleBookmarksToolbar();"/>
       
  1269 +              <menuseparator/>
       
  1270 +              <!-- Bookmarks toolbar items -->
       
  1271 +            </menupopup>
       
  1272 +          </menu>
       
  1273 +          <menu id="BMB_unsortedBookmarks"
       
  1274 +                class="menu-iconic bookmark-item subviewbutton"
       
  1275 +                label="&bookmarksMenuButton.other.label;"
       
  1276 +                container="true">
       
  1277 +            <menupopup id="BMB_unsortedBookmarksPopup"
       
  1278 +                       placespopup="true"
       
  1279 +                       context="placesContext"
       
  1280 +                       onpopupshowing="if (!this.parentNode._placesView)
       
  1281 +                                         new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.unfiledGuid}`,
       
  1282 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
       
  1283 +          </menu>
       
  1284 +          <menu id="BMB_mobileBookmarks"
       
  1285 +                class="menu-iconic bookmark-item subviewbutton"
       
  1286 +                label="&bookmarksMenuButton.mobile.label;"
       
  1287 +                hidden="true"
       
  1288 +                container="true">
       
  1289 +            <menupopup id="BMB_mobileBookmarksPopup"
       
  1290 +                       placespopup="true"
       
  1291 +                       context="placesContext"
       
  1292 +                       onpopupshowing="if (!this.parentNode._placesView)
       
  1293 +                                         new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.mobileGuid}`,
       
  1294 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
       
  1295 +          </menu>
       
  1296 +
       
  1297 +          <menuseparator/>
       
  1298 +          <!-- Bookmarks menu items will go here -->
       
  1299 +          <menuitem id="BMB_bookmarksShowAll"
       
  1300 +                    class="subviewbutton panel-subview-footer"
       
  1301 +                    label="&showAllBookmarks2.label;"
       
  1302 +                    command="Browser:ShowAllBookmarks"
       
  1303 +                    key="manBookmarkKb"/>
       
  1304 +        </menupopup>
       
  1305 +      </toolbarbutton>
       
  1306 +
       
  1307 +      <toolbaritem id="search-container"
       
  1308 +                   class="chromeclass-toolbar-additional"
       
  1309 +                   title="&searchItem.title;"
       
  1310 +                   align="center"
       
  1311 +                   flex="100"
       
  1312 +                   persist="width">
       
  1313 +        <toolbartabstop/>
       
  1314 +        <searchbar id="searchbar" flex="1"/>
       
  1315 +        <toolbartabstop/>
       
  1316 +      </toolbaritem>
       
  1317 +    </toolbarpalette>
       
  1318 +  </toolbox>
       
  1319 +
       
  1320 +  <hbox id="fullscr-toggler" hidden="true"/>
       
  1321 +
       
  1322 +  <deck id="content-deck" flex="1" renderroot="content">
       
  1323 +    <hbox flex="1" id="browser">
       
  1324 +      <vbox id="browser-border-start" hidden="true" layer="true"/>
       
  1325 +      <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
       
  1326 +        <sidebarheader id="sidebar-header" align="center">
       
  1327 +          <toolbarbutton id="sidebar-switcher-target" flex="1" class="tabbable">
       
  1328 +            <image id="sidebar-icon" consumeanchor="sidebar-switcher-target"/>
       
  1329 +            <label id="sidebar-title" crop="end" flex="1" control="sidebar"/>
       
  1330 +            <image id="sidebar-switcher-arrow"/>
       
  1331 +          </toolbarbutton>
       
  1332 +          <image id="sidebar-throbber"/>
       
  1333 +# To ensure the button label's intrinsic width doesn't expand the sidebar
       
  1334 +# if the label is long, the button needs flex=1.
       
  1335 +# To ensure the button doesn't expand unnecessarily for short labels, the
       
  1336 +# spacer should significantly out-flex the button.
       
  1337 +          <spacer flex="1000"/>
       
  1338 +          <toolbarbutton id="sidebar-close" class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
       
  1339 +        </sidebarheader>
       
  1340 +        <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" disablefullscreen="true"
       
  1341 +                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
       
  1342 +      </vbox>
       
  1343 +
       
  1344 +      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
       
  1345 +      <vbox id="appcontent" flex="1">
       
  1346 +        <!-- gHighPriorityNotificationBox will be added here lazily. -->
       
  1347 +        <tabbox id="tabbrowser-tabbox"
       
  1348 +                flex="1" tabcontainer="tabbrowser-tabs">
       
  1349 +          <tabpanels id="tabbrowser-tabpanels"
       
  1350 +                     flex="1" class="plain" selectedIndex="0"/>
       
  1351 +        </tabbox>
       
  1352 +      </vbox>
       
  1353 +      <vbox id="browser-border-end" hidden="true" layer="true"/>
       
  1354 +    </hbox>
       
  1355 +    <box id="customization-container" flex="1" hidden="true"><![CDATA[
       
  1356 +#include ../../components/customizableui/content/customizeMode.inc.xul
       
  1357 +    ]]></box>
       
  1358 +  </deck>
       
  1359 +
       
  1360 +  <html:div id="fullscreen-warning" class="pointerlockfswarning" hidden="true" renderroot="content">
       
  1361 +    <html:div class="pointerlockfswarning-domain-text">
       
  1362 +      &fullscreenWarning.beforeDomain.label;
       
  1363 +      <html:span class="pointerlockfswarning-domain"/>
       
  1364 +      &fullscreenWarning.afterDomain.label;
       
  1365 +    </html:div>
       
  1366 +    <html:div class="pointerlockfswarning-generic-text">
       
  1367 +      &fullscreenWarning.generic.label;
       
  1368 +    </html:div>
       
  1369 +    <html:button id="fullscreen-exit-button"
       
  1370 +                 onclick="FullScreen.exitDomFullScreen();">
       
  1371 +#ifdef XP_MACOSX
       
  1372 +            &exitDOMFullscreenMac.button;
       
  1373 +#else
       
  1374 +            &exitDOMFullscreen.button;
       
  1375 +#endif
       
  1376 +    </html:button>
       
  1377 +  </html:div>
       
  1378 +
       
  1379 +  <html:div id="pointerlock-warning" class="pointerlockfswarning" hidden="true" renderroot="content">
       
  1380 +    <html:div class="pointerlockfswarning-domain-text">
       
  1381 +      &pointerlockWarning.beforeDomain.label;
       
  1382 +      <html:span class="pointerlockfswarning-domain"/>
       
  1383 +      &pointerlockWarning.afterDomain.label;
       
  1384 +    </html:div>
       
  1385 +    <html:div class="pointerlockfswarning-generic-text">
       
  1386 +      &pointerlockWarning.generic.label;
       
  1387 +    </html:div>
       
  1388 +  </html:div>
       
  1389 +
       
  1390 +  <vbox id="browser-bottombox" layer="true" renderroot="content">
       
  1391 +    <!-- gNotificationBox will be added here lazily. -->
       
  1392 +  </vbox>
       
  1393 +</window>
       
  1394 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
       
  1395 --- a/browser/base/jar.mn
       
  1396 +++ b/browser/base/jar.mn
       
  1397 @@ -28,16 +28,18 @@ browser.jar:
       
  1398          content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
       
  1399  *       content/browser/browser.css                   (content/browser.css)
       
  1400          content/browser/browser.js                    (content/browser.js)
       
  1401  #ifdef MOZ_BROWSER_XHTML
       
  1402  *       content/browser/browser.xhtml                 (content/browser.xhtml)
       
  1403  #else
       
  1404  *       content/browser/browser.xul                   (content/browser.xul)
       
  1405  #endif
       
  1406 +*       content/browser/browser-kde.xul               (content/browser-kde.xul)
       
  1407 +%       override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
       
  1408          content/browser/browser-addons.js             (content/browser-addons.js)
       
  1409          content/browser/browser-allTabsMenu.js        (content/browser-allTabsMenu.js)
       
  1410          content/browser/browser-captivePortal.js      (content/browser-captivePortal.js)
       
  1411          content/browser/browser-ctrlTab.js            (content/browser-ctrlTab.js)
       
  1412          content/browser/browser-customization.js      (content/browser-customization.js)
       
  1413          content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
       
  1414          content/browser/browser-contentblocking.js    (content/browser-contentblocking.js)
       
  1415  #ifndef MOZILLA_OFFICIAL
       
  1416 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
    14 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
  1417 --- a/browser/components/preferences/in-content/main.js
    15 --- a/browser/components/preferences/in-content/main.js
  1418 +++ b/browser/components/preferences/in-content/main.js
    16 +++ b/browser/components/preferences/in-content/main.js
  1419 @@ -339,16 +339,23 @@ var gMainPane = {
    17 @@ -339,16 +339,23 @@ var gMainPane = {
  1420          }, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]);
    18          }, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]);