Mercurial Mercurial > hg > mozilla / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
firefox-kde.patch
branchfirefox65
changeset 1085 87f893cf45b9
parent 1082 821cfbe8efcc
child 1089 eca1c1f2fe50
equal deleted inserted replaced
1084:b0b3c507e253 1085:87f893cf45b9 
     1 # HG changeset patch
 
     1 # HG changeset patch
 
     2 # Parent  f2429084f187d5758508ae547c411943cba60fcf
 
     2 # Parent  693f0baece29cc958a7d91b89fd12e3b89a502e3
 
     3 
     3 
     4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 
     4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 
     5 new file mode 100644
 
     5 new file mode 100644
 
     6 --- /dev/null
 
     6 --- /dev/null
 
     7 +++ b/browser/base/content/browser-kde.xul
 
     7 +++ b/browser/base/content/browser-kde.xul
 
     8 @@ -0,0 +1,1384 @@
 
     8 @@ -0,0 +1,1395 @@
 
     9 +#filter substitution
 
     9 +#filter substitution
 
    10 +<?xml version="1.0"?>
 
    10 +<?xml version="1.0"?>
 
    11 +# -*- Mode: HTML -*-
 
    11 +# -*- Mode: HTML -*-
 
    12 +#
 
    12 +#
 
    13 +# This Source Code Form is subject to the terms of the Mozilla Public
 
    13 +# This Source Code Form is subject to the terms of the Mozilla Public
 
    79 +        sizemode="normal"
 
    79 +        sizemode="normal"
 
    80 +        retargetdocumentfocus="urlbar"
 
    80 +        retargetdocumentfocus="urlbar"
 
    81 +        persist="screenX screenY width height sizemode"
 
    81 +        persist="screenX screenY width height sizemode"
 
    82 +#ifdef BROWSER_XHTML
 
    82 +#ifdef BROWSER_XHTML
 
    83 +        hidden="true"
 
    83 +        hidden="true"
 
       
    84 +        mozpersist=""
 
    84 +#endif
 
    85 +#endif
 
    85 +        >
 
    86 +        >
 
    86 +
 
    87 +
 
    87 +# All JS files which are needed by browser.xul and other top level windows to
 
    88 +# All JS files which are needed by browser.xul and other top level windows to
 
    88 +# support MacOS specific features *must* go into the global-scripts.inc file so
 
    89 +# support MacOS specific features *must* go into the global-scripts.inc file so
 
    93 +#ifdef BROWSER_XHTML
 
    94 +#ifdef BROWSER_XHTML
 
    94 +xmlns="http://www.w3.org/1999/xhtml"
 
    95 +xmlns="http://www.w3.org/1999/xhtml"
 
    95 +#endif
 
    96 +#endif
 
    96 +>
 
    97 +>
 
    97 +  Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
 
    98 +  Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
 
       
    99 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-captivePortal.js", this);
 
       
   100 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-compacttheme.js", this);
 
       
   101 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-contentblocking.js", this);
 
       
   102 +#ifdef MOZ_DATA_REPORTING
 
       
   103 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-data-submission-info-bar.js", this);
 
       
   104 +#endif
 
       
   105 +#ifndef MOZILLA_OFFICIAL
 
       
   106 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-development-helpers.js", this);
 
       
   107 +#endif
 
       
   108 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-media.js", this);
 
       
   109 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-pageActions.js", this);
 
       
   110 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-plugins.js", this);
 
       
   111 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-sidebar.js", this);
 
       
   112 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-tabsintitlebar.js", this);
 
    98 +  Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);
 
   113 +  Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);
 
       
   114 +  Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
 
    99 +
 
   115 +
 
   100 +  window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
 
   116 +  window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
 
   101 +  window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
 
   117 +  window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
 
   102 +  window.onclose = WindowIsClosing;
 
   118 +  window.onclose = WindowIsClosing;
 
   103 +
 
   119 +
 
   150 +                accesskey="&unpinSelectedTabs.accesskey;"
 
   166 +                accesskey="&unpinSelectedTabs.accesskey;"
 
   151 +                oncommand="gBrowser.unpinMultiSelectedTabs();"/>
 
   167 +                oncommand="gBrowser.unpinMultiSelectedTabs();"/>
 
   152 +      <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
 
   168 +      <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
 
   153 +                accesskey="&duplicateTab.accesskey;"
 
   169 +                accesskey="&duplicateTab.accesskey;"
 
   154 +                oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
 
   170 +                oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
 
       
   171 +      <menuitem id="context_duplicateTabs" label="&duplicateTabs.label;"
 
       
   172 +                accesskey="&duplicateTabs.accesskey;"
 
       
   173 +                oncommand="TabContextMenu.duplicateSelectedTabs();"/>
 
   155 +      <menuseparator/>
 
   174 +      <menuseparator/>
 
   156 +      <menuitem id="context_selectAllTabs" label="&selectAllTabs.label;" accesskey="&selectAllTabs.accesskey;"
 
   175 +      <menuitem id="context_selectAllTabs" label="&selectAllTabs.label;" accesskey="&selectAllTabs.accesskey;"
 
   157 +                oncommand="gBrowser.selectAllTabs();"/>
 
   176 +                oncommand="gBrowser.selectAllTabs();"/>
 
   158 +      <menuitem id="context_bookmarkSelectedTabs"
 
   177 +      <menuitem id="context_bookmarkSelectedTabs"
 
   159 +                hidden="true"
 
   178 +                hidden="true"
 
   260 +           level="parent">
 
   279 +           level="parent">
 
   261 +      <html:div class="urlbarView-body-outer">
 
   280 +      <html:div class="urlbarView-body-outer">
 
   262 +        <html:div class="urlbarView-body-inner">
 
   281 +        <html:div class="urlbarView-body-inner">
 
   263 +          <!-- TODO: add search suggestions notification -->
 
   282 +          <!-- TODO: add search suggestions notification -->
 
   264 +          <html:div class="urlbarView-results"/>
 
   283 +          <html:div class="urlbarView-results"/>
 
   265 +          <!-- TODO: add footer -->
 
       
   266 +        </html:div>
 
   284 +        </html:div>
 
   267 +      </html:div>
 
   285 +      </html:div>
 
       
   286 +      <hbox class="search-one-offs"
 
       
   287 +            compact="true"
 
       
   288 +            includecurrentengine="true"
 
       
   289 +            disabletab="true"/>
 
   268 +    </panel>
 
   290 +    </panel>
 
   269 +
 
   291 +
 
   270 +   <!-- for date/time picker. consumeoutsideclicks is set to never, so that
 
   292 +    <!-- for date/time picker. consumeoutsideclicks is set to never, so that
 
   271 +        clicks on the anchored input box are never consumed. -->
 
   293 +         clicks on the anchored input box are never consumed. -->
 
   272 +    <panel id="DateTimePickerPanel"
 
   294 +    <panel id="DateTimePickerPanel"
 
   273 +           type="arrow"
 
   295 +           type="arrow"
 
   274 +           hidden="true"
 
   296 +           hidden="true"
 
   275 +           orient="vertical"
 
   297 +           orient="vertical"
 
   276 +           noautofocus="true"
 
   298 +           noautofocus="true"
 
   320 +                  label="&editBookmark.showForNewBookmarks.label;"
 
   342 +                  label="&editBookmark.showForNewBookmarks.label;"
 
   321 +                  accesskey="&editBookmark.showForNewBookmarks.accesskey;"
 
   343 +                  accesskey="&editBookmark.showForNewBookmarks.accesskey;"
 
   322 +                  oncommand="StarUI.onShowForNewBookmarksCheckboxCommand();"/>
 
   344 +                  oncommand="StarUI.onShowForNewBookmarksCheckboxCommand();"/>
 
   323 +      </vbox>
 
   345 +      </vbox>
 
   324 +      <hbox id="editBookmarkPanelBottomButtons"
 
   346 +      <hbox id="editBookmarkPanelBottomButtons"
 
       
   347 +            class="panel-footer"
 
   325 +            style="min-width: &editBookmark.panel.width;;">
 
   348 +            style="min-width: &editBookmark.panel.width;;">
 
   326 +#ifdef XP_UNIX
 
   349 +#ifdef XP_UNIX
 
   327 +        <button id="editBookmarkPanelDoneButton"
 
   350 +        <button id="editBookmarkPanelDoneButton"
 
   328 +                class="editBookmarkPanelBottomButton"
 
   351 +                class="editBookmarkPanelBottomButton"
 
   329 +                label="&editBookmark.done.label;"
 
   352 +                label="&editBookmark.done.label;"
 
   434 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
 
   457 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
 
   435 +                accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
 
   458 +                accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
 
   436 +                label="&customizeMenu.pinToOverflowMenu.label;"
 
   459 +                label="&customizeMenu.pinToOverflowMenu.label;"
 
   437 +                contexttype="toolbaritem"
 
   460 +                contexttype="toolbaritem"
 
   438 +                class="customize-context-moveToPanel"/>
 
   461 +                class="customize-context-moveToPanel"/>
 
   439 +      <menuitem oncommand="ToolbarContextMenu.onDownloadsAutoHideChange(event)"
 
   462 +      <menuitem id="toolbar-context-autohide-downloads-button"
 
       
   463 +                oncommand="ToolbarContextMenu.onDownloadsAutoHideChange(event);"
 
   440 +                type="checkbox"
 
   464 +                type="checkbox"
 
   441 +                accesskey="&customizeMenu.autoHideDownloadsButton.accesskey;"
 
   465 +                accesskey="&customizeMenu.autoHideDownloadsButton.accesskey;"
 
   442 +                label="&customizeMenu.autoHideDownloadsButton.label;"
 
   466 +                label="&customizeMenu.autoHideDownloadsButton.label;"
 
   443 +                contexttype="toolbaritem"
 
   467 +                contexttype="toolbaritem"/>
 
   444 +                class="customize-context-autoHide"/>
 
       
   445 +      <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
 
   468 +      <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
 
   446 +                accesskey="&customizeMenu.removeFromToolbar.accesskey;"
 
   469 +                accesskey="&customizeMenu.removeFromToolbar.accesskey;"
 
   447 +                label="&customizeMenu.removeFromToolbar.label;"
 
   470 +                label="&customizeMenu.removeFromToolbar.label;"
 
   448 +                contexttype="toolbaritem"
 
   471 +                contexttype="toolbaritem"
 
   449 +                class="customize-context-removeFromToolbar"/>
 
   472 +                class="customize-context-removeFromToolbar"/>
 
   450 +      <menuitem id="toolbar-context-reloadSelectedTab"
 
   473 +      <menuitem id="toolbar-context-reloadSelectedTab"
 
   451 +                class="toolbaritem-tabsmenu"
 
       
   452 +                contexttype="tabbar"
 
   474 +                contexttype="tabbar"
 
   453 +                oncommand="gBrowser.reloadMultiSelectedTabs();"
 
   475 +                oncommand="gBrowser.reloadMultiSelectedTabs();"
 
   454 +                label="&toolbarContextMenu.reloadSelectedTab.label;"
 
   476 +                label="&toolbarContextMenu.reloadSelectedTab.label;"
 
   455 +                accesskey="&toolbarContextMenu.reloadSelectedTab.accesskey;"/>
 
   477 +                accesskey="&toolbarContextMenu.reloadSelectedTab.accesskey;"/>
 
   456 +      <menuitem id="toolbar-context-reloadSelectedTabs"
 
   478 +      <menuitem id="toolbar-context-reloadSelectedTabs"
 
   457 +                class="toolbaritem-tabsmenu"
 
       
   458 +                contexttype="tabbar"
 
   479 +                contexttype="tabbar"
 
   459 +                oncommand="gBrowser.reloadMultiSelectedTabs();"
 
   480 +                oncommand="gBrowser.reloadMultiSelectedTabs();"
 
   460 +                label="&toolbarContextMenu.reloadSelectedTabs.label;"
 
   481 +                label="&toolbarContextMenu.reloadSelectedTabs.label;"
 
   461 +                accesskey="&toolbarContextMenu.reloadSelectedTabs.accesskey;"/>
 
   482 +                accesskey="&toolbarContextMenu.reloadSelectedTabs.accesskey;"/>
 
   462 +      <menuitem id="toolbar-context-bookmarkSelectedTab"
 
   483 +      <menuitem id="toolbar-context-bookmarkSelectedTab"
 
   463 +                class="toolbaritem-tabsmenu"
 
       
   464 +                contexttype="tabbar"
 
   484 +                contexttype="tabbar"
 
   465 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
 
   485 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
 
   466 +                label="&toolbarContextMenu.bookmarkSelectedTab.label;"
 
   486 +                label="&toolbarContextMenu.bookmarkSelectedTab.label;"
 
   467 +                accesskey="&toolbarContextMenu.bookmarkSelectedTab.accesskey;"/>
 
   487 +                accesskey="&toolbarContextMenu.bookmarkSelectedTab.accesskey;"/>
 
   468 +      <menuitem id="toolbar-context-bookmarkSelectedTabs"
 
   488 +      <menuitem id="toolbar-context-bookmarkSelectedTabs"
 
   469 +                class="toolbaritem-tabsmenu"
 
       
   470 +                contexttype="tabbar"
 
   489 +                contexttype="tabbar"
 
   471 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
 
   490 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
 
   472 +                label="&toolbarContextMenu.bookmarkSelectedTabs.label;"
 
   491 +                label="&toolbarContextMenu.bookmarkSelectedTabs.label;"
 
   473 +                accesskey="&toolbarContextMenu.bookmarkSelectedTabs.accesskey;"/>
 
   492 +                accesskey="&toolbarContextMenu.bookmarkSelectedTabs.accesskey;"/>
 
   474 +      <menuitem id="toolbar-context-selectAllTabs"
 
   493 +      <menuitem id="toolbar-context-selectAllTabs"
 
   475 +                class="toolbaritem-tabsmenu"
 
       
   476 +                contexttype="tabbar"
 
   494 +                contexttype="tabbar"
 
   477 +                oncommand="gBrowser.selectAllTabs();"
 
   495 +                oncommand="gBrowser.selectAllTabs();"
 
   478 +                label="&toolbarContextMenu.selectAllTabs.label;"
 
   496 +                label="&toolbarContextMenu.selectAllTabs.label;"
 
   479 +                accesskey="&toolbarContextMenu.selectAllTabs.accesskey;"/>
 
   497 +                accesskey="&toolbarContextMenu.selectAllTabs.accesskey;"/>
 
   480 +      <menuitem id="toolbar-context-undoCloseTab"
 
   498 +      <menuitem id="toolbar-context-undoCloseTab"
 
   481 +                class="toolbaritem-tabsmenu"
 
       
   482 +                contexttype="tabbar"
 
   499 +                contexttype="tabbar"
 
   483 +                label="&toolbarContextMenu.undoCloseTab.label;"
 
   500 +                label="&toolbarContextMenu.undoCloseTab.label;"
 
   484 +                accesskey="&toolbarContextMenu.undoCloseTab.accesskey;"
 
   501 +                accesskey="&toolbarContextMenu.undoCloseTab.accesskey;"
 
   485 +                observes="History:UndoCloseTab"/>
 
   502 +                observes="History:UndoCloseTab"/>
 
   486 +      <menuseparator/>
 
   503 +      <menuseparator/>
 
   720 +      </hbox>
 
   737 +      </hbox>
 
   721 +    </hbox>
 
   738 +    </hbox>
 
   722 +  </popupset>
 
   739 +  </popupset>
 
   723 +  <box id="appMenu-viewCache" hidden="true"/>
 
   740 +  <box id="appMenu-viewCache" hidden="true"/>
 
   724 +
 
   741 +
 
   725 +<vbox id="titlebar">
 
   742 +  <toolbox id="navigator-toolbox">
 
   726 +  <hbox id="titlebar-content">
 
   743 +
 
   727 +    <spacer id="titlebar-spacer" flex="1"/>
 
   744 +    <vbox id="titlebar">
 
   728 +    <hbox id="titlebar-buttonbox-container">
 
   745 +      <!-- Menu -->
 
   729 +      <hbox id="titlebar-buttonbox" class="titlebar-color">
 
   746 +      <toolbar type="menubar" id="toolbar-menubar"
 
   730 +        <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/>
 
   747 +               class="browser-toolbar chromeclass-menubar titlebar-color"
 
   731 +        <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/>
 
   748 +               customizable="true"
 
   732 +        <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/>
 
   749 +               mode="icons"
 
   733 +      </hbox>
 
   750 +#ifdef MENUBAR_CAN_AUTOHIDE
 
   734 +    </hbox>
 
   751 +               toolbarname="&menubarCmd.label;"
 
   735 +#ifdef XP_MACOSX
 
   752 +               accesskey="&menubarCmd.accesskey;"
 
   736 +    <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary
 
   753 +               autohide="true"
 
   737 +         buttonbox from reversing order in RTL by forcing an LTR direction. -->
 
       
   738 +    <hbox id="titlebar-secondary-buttonbox" dir="ltr">
 
       
   739 +      <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" aria-live="polite"/>
 
       
   740 +      <hbox class="private-browsing-indicator"/>
 
       
   741 +      <hbox id="titlebar-fullscreen-button"/>
 
       
   742 +    </hbox>
 
       
   743 +#endif
 
   754 +#endif
 
   744 +  </hbox>
 
   755 +               context="toolbar-context-menu">
 
   745 +</vbox>
 
   756 +        <toolbaritem id="menubar-items" align="center">
 
   746 +
 
       
   747 +  <toolbox id="navigator-toolbox">
 
       
   748 +    <!-- Menu -->
 
       
   749 +    <toolbar type="menubar" id="toolbar-menubar"
 
       
   750 +             class="browser-toolbar chromeclass-menubar titlebar-color"
 
       
   751 +             customizable="true"
 
       
   752 +             mode="icons"
 
       
   753 +#ifdef MENUBAR_CAN_AUTOHIDE
 
       
   754 +             toolbarname="&menubarCmd.label;"
 
       
   755 +             accesskey="&menubarCmd.accesskey;"
 
       
   756 +             autohide="true"
 
       
   757 +#endif
 
       
   758 +             context="toolbar-context-menu">
 
       
   759 +      <toolbaritem id="menubar-items" align="center">
 
       
   760 +# The entire main menubar is placed into browser-menubar.inc, so that it can be
 
   757 +# The entire main menubar is placed into browser-menubar.inc, so that it can be
 
   761 +# shared with other top level windows in macWindow.inc.xul.
 
   758 +# shared with other top level windows in macWindow.inc.xul.
 
   762 +#include browser-menubar.inc
 
   759 +#include browser-menubar.inc
 
   763 +      </toolbaritem>
 
   760 +        </toolbaritem>
 
       
   761 +        <spacer flex="1" skipintoolbarset="true" ordinal="1000"/>
 
       
   762 +#include titlebar-items.inc.xul
 
       
   763 +      </toolbar>
 
       
   764 +
 
       
   765 +      <toolbar id="TabsToolbar"
 
       
   766 +               class="browser-toolbar titlebar-color"
 
       
   767 +               fullscreentoolbar="true"
 
       
   768 +               customizable="true"
 
       
   769 +               customizationtarget="TabsToolbar-customization-target"
 
       
   770 +               mode="icons"
 
       
   771 +               aria-label="&tabsToolbar.label;"
 
       
   772 +               context="toolbar-context-menu"
 
       
   773 +               flex="1">
 
       
   774 +        <vbox flex="1" class="toolbar-items">
 
       
   775 +          <spacer flex="1000"/>
 
       
   776 +
 
       
   777 +          <hbox id="TabsToolbar-customization-target" flex="1">
 
       
   778 +            <hbox class="titlebar-spacer" type="pre-tabs"
 
       
   779 +                  skipintoolbarset="true"/>
 
       
   780 +
 
       
   781 +            <tabs id="tabbrowser-tabs"
 
       
   782 +                  flex="1"
 
       
   783 +                  setfocus="false"
 
       
   784 +                  tooltip="tabbrowser-tab-tooltip"
 
       
   785 +                  stopwatchid="FX_TAB_CLICK_MS">
 
       
   786 +              <tab class="tabbrowser-tab" selected="true" visuallyselected="true" fadein="true"/>
 
       
   787 +            </tabs>
 
       
   788 +
 
       
   789 +            <toolbarbutton id="new-tab-button"
 
       
   790 +                           class="toolbarbutton-1 chromeclass-toolbar-additional"
 
       
   791 +                           label="&tabCmd.label;"
 
       
   792 +                           command="cmd_newNavigatorTab"
 
       
   793 +                           onclick="checkForMiddleClick(this, event);"
 
       
   794 +                           tooltip="dynamic-shortcut-tooltip"
 
       
   795 +                           ondrop="newTabButtonObserver.onDrop(event)"
 
       
   796 +                           ondragover="newTabButtonObserver.onDragOver(event)"
 
       
   797 +                           ondragenter="newTabButtonObserver.onDragOver(event)"
 
       
   798 +                           ondragexit="newTabButtonObserver.onDragExit(event)"
 
       
   799 +                           cui-areatype="toolbar"
 
       
   800 +                           removable="true"/>
 
       
   801 +
 
       
   802 +            <toolbarbutton id="alltabs-button"
 
       
   803 +                           class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button badged-button"
 
       
   804 +                           oncommand="gTabsPanel.showAllTabsPanel();"
 
       
   805 +                           label="&listAllTabs.label;"
 
       
   806 +                           tooltiptext="&listAllTabs.label;"
 
       
   807 +                           removable="false"/>
 
       
   808 +
 
       
   809 +            <hbox class="titlebar-spacer" type="post-tabs"
 
       
   810 +                  ordinal="1000"
 
       
   811 +                  skipintoolbarset="true"/>
 
       
   812 +          </hbox>
 
       
   813 +        </vbox>
 
   764 +
 
   814 +
 
   765 +#ifndef XP_MACOSX
 
   815 +#ifndef XP_MACOSX
 
   766 +      <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"
 
   816 +        <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
 
   767 +            skipintoolbarset="true"/>
 
   817 +                ordinal="1000"
 
       
   818 +                aria-live="polite" skipintoolbarset="true"/>
 
       
   819 +        <hbox class="private-browsing-indicator" skipintoolbarset="true"
 
       
   820 +              ordinal="1000"/>
 
   768 +#endif
 
   821 +#endif
 
   769 +    </toolbar>
 
   822 +
 
   770 +
 
   823 +#include titlebar-items.inc.xul
 
   771 +    <toolbar id="TabsToolbar"
 
   824 +
 
   772 +             class="browser-toolbar titlebar-color"
 
   825 +#ifdef XP_MACOSX
 
   773 +             fullscreentoolbar="true"
 
   826 +        <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary
 
   774 +             customizable="true"
 
   827 +             buttonbox from reversing order in RTL by forcing an LTR direction. -->
 
   775 +             mode="icons"
 
   828 +        <hbox id="titlebar-secondary-buttonbox" dir="ltr">
 
   776 +             aria-label="&tabsToolbar.label;"
 
   829 +          <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" aria-live="polite"/>
 
   777 +             context="toolbar-context-menu">
 
   830 +          <hbox class="private-browsing-indicator"/>
 
   778 +      <hbox class="titlebar-placeholder" type="pre-tabs"
 
   831 +          <hbox id="titlebar-fullscreen-button"/>
 
   779 +            skipintoolbarset="true"/>
 
   832 +        </hbox>
 
   780 +
 
       
   781 +      <tabs id="tabbrowser-tabs"
 
       
   782 +            flex="1"
 
       
   783 +            setfocus="false"
 
       
   784 +            tooltip="tabbrowser-tab-tooltip"
 
       
   785 +            stopwatchid="FX_TAB_CLICK_MS">
 
       
   786 +        <tab class="tabbrowser-tab" selected="true" visuallyselected="true" fadein="true"/>
 
       
   787 +      </tabs>
 
       
   788 +
 
       
   789 +      <toolbarbutton id="new-tab-button"
 
       
   790 +                     class="toolbarbutton-1 chromeclass-toolbar-additional"
 
       
   791 +                     label="&tabCmd.label;"
 
       
   792 +                     command="cmd_newNavigatorTab"
 
       
   793 +                     onclick="checkForMiddleClick(this, event);"
 
       
   794 +                     tooltip="dynamic-shortcut-tooltip"
 
       
   795 +                     ondrop="newTabButtonObserver.onDrop(event)"
 
       
   796 +                     ondragover="newTabButtonObserver.onDragOver(event)"
 
       
   797 +                     ondragenter="newTabButtonObserver.onDragOver(event)"
 
       
   798 +                     ondragexit="newTabButtonObserver.onDragExit(event)"
 
       
   799 +                     cui-areatype="toolbar"
 
       
   800 +                     removable="true"/>
 
       
   801 +
 
       
   802 +      <toolbarbutton id="alltabs-button"
 
       
   803 +                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button badged-button"
 
       
   804 +                     oncommand="gTabsPanel.showAllTabsPanel();"
 
       
   805 +                     label="&listAllTabs.label;"
 
       
   806 +                     tooltiptext="&listAllTabs.label;"
 
       
   807 +                     removable="false"/>
 
       
   808 +
 
       
   809 +      <hbox class="titlebar-placeholder" type="post-tabs"
 
       
   810 +            ordinal="1000"
 
       
   811 +            skipintoolbarset="true"/>
 
       
   812 +
 
       
   813 +      <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;"
 
       
   814 +              ordinal="1000"
 
       
   815 +              aria-live="polite" skipintoolbarset="true"/>
 
       
   816 +      <hbox class="private-browsing-indicator" skipintoolbarset="true"
 
       
   817 +            ordinal="1000"/>
 
       
   818 +      <hbox class="titlebar-placeholder" type="caption-buttons"
 
       
   819 +#ifndef XP_MACOSX
 
       
   820 +            ordinal="1000"
 
       
   821 +#endif
 
   833 +#endif
 
   822 +            skipintoolbarset="true"/>
 
   834 +      </toolbar>
 
   823 +
 
   835 +
 
   824 +#ifdef XP_MACOSX
 
   836 +    </vbox>
 
   825 +      <hbox class="titlebar-placeholder" type="fullscreen-button"
 
       
   826 +            skipintoolbarset="true"/>
 
       
   827 +#endif
 
       
   828 +    </toolbar>
 
       
   829 +
 
   837 +
 
   830 +    <toolbar id="nav-bar"
 
   838 +    <toolbar id="nav-bar"
 
   831 +             class="browser-toolbar"
 
   839 +             class="browser-toolbar"
 
   832 +             aria-label="&navbarCmd.label;"
 
   840 +             aria-label="&navbarCmd.label;"
 
   833 +             fullscreentoolbar="true" mode="icons" customizable="true"
 
   841 +             fullscreentoolbar="true" mode="icons" customizable="true"
 
   991 +                         tooltiptext="&urlbar.persistentStorageNotificationAnchor.tooltip;"/>
 
   999 +                         tooltiptext="&urlbar.persistentStorageNotificationAnchor.tooltip;"/>
 
   992 +                  <image id="midi-notification-icon" class="notification-anchor-icon midi-icon" role="button"
 
  1000 +                  <image id="midi-notification-icon" class="notification-anchor-icon midi-icon" role="button"
 
   993 +                         tooltiptext="&urlbar.midiNotificationAnchor.tooltip;"/>
 
  1001 +                         tooltiptext="&urlbar.midiNotificationAnchor.tooltip;"/>
 
   994 +                  <image id="webauthn-notification-icon" class="notification-anchor-icon" role="button"
 
  1002 +                  <image id="webauthn-notification-icon" class="notification-anchor-icon" role="button"
 
   995 +                         tooltiptext="&urlbar.webAuthnAnchor.tooltip;"/>
 
  1003 +                         tooltiptext="&urlbar.webAuthnAnchor.tooltip;"/>
 
       
  1004 +                  <image id="storage-access-notification-icon" class="notification-anchor-icon storage-access-icon" role="button"
 
       
  1005 +                         tooltiptext="&urlbar.storageAccessAnchor.tooltip;"/>
 
   996 +                </box>
 
  1006 +                </box>
 
   997 +                <image id="connection-icon"/>
 
  1007 +                <image id="connection-icon"/>
 
   998 +                <image id="extension-icon"/>
 
  1008 +                <image id="extension-icon"/>
 
   999 +                <image id="remote-control-icon"
 
  1009 +                <image id="remote-control-icon"
 
  1000 +                       tooltiptext="&urlbar.remoteControlNotificationAnchor.tooltip;"/>
 
  1010 +                       tooltiptext="&urlbar.remoteControlNotificationAnchor.tooltip;"/>
 
  1129 +
 
  1139 +
 
  1130 +        <toolbarbutton id="close-button"
 
  1140 +        <toolbarbutton id="close-button"
 
  1131 +                       tooltiptext="&fullScreenClose.tooltip;"
 
  1141 +                       tooltiptext="&fullScreenClose.tooltip;"
 
  1132 +                       oncommand="BrowserTryToCloseWindow();"/>
 
  1142 +                       oncommand="BrowserTryToCloseWindow();"/>
 
  1133 +      </hbox>
 
  1143 +      </hbox>
 
       
  1144 +
 
       
  1145 +      <box id="library-animatable-box" class="toolbarbutton-animatable-box">
 
       
  1146 +        <image class="toolbarbutton-animatable-image"/>
 
       
  1147 +      </box>
 
  1134 +    </toolbar>
 
  1148 +    </toolbar>
 
  1135 +
 
  1149 +
 
  1136 +    <toolbar id="PersonalToolbar"
 
  1150 +    <toolbar id="PersonalToolbar"
 
  1137 +             mode="icons"
 
  1151 +             mode="icons"
 
  1138 +             class="browser-toolbar chromeclass-directories"
 
  1152 +             class="browser-toolbar chromeclass-directories"
 
  1310 +                   flex="100"
 
  1324 +                   flex="100"
 
  1311 +                   persist="width">
 
  1325 +                   persist="width">
 
  1312 +        <searchbar id="searchbar" flex="1"/>
 
  1326 +        <searchbar id="searchbar" flex="1"/>
 
  1313 +      </toolbaritem>
 
  1327 +      </toolbaritem>
 
  1314 +    </toolbarpalette>
 
  1328 +    </toolbarpalette>
 
  1315 +    <box id="library-animatable-box" class="toolbarbutton-animatable-box">
 
       
  1316 +      <image class="toolbarbutton-animatable-image"/>
 
       
  1317 +    </box>
 
       
  1318 +  </toolbox>
 
  1329 +  </toolbox>
 
  1319 +
 
  1330 +
 
  1320 +  <hbox id="fullscr-toggler" hidden="true"/>
 
  1331 +  <hbox id="fullscr-toggler" hidden="true"/>
 
  1321 +
 
  1332 +
 
  1322 +  <deck id="content-deck" flex="1">
 
  1333 +  <deck id="content-deck" flex="1">
 
  1341 +                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
 
  1352 +                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
 
  1342 +      </vbox>
 
  1353 +      </vbox>
 
  1343 +
 
  1354 +
 
  1344 +      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
 
  1355 +      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
 
  1345 +      <vbox id="appcontent" flex="1">
 
  1356 +      <vbox id="appcontent" flex="1">
 
  1346 +        <notificationbox id="high-priority-global-notificationbox" notificationside="top"/>
 
  1357 +        <!-- gHighPriorityNotificationBox will be added here lazily. -->
 
  1347 +        <tabbox id="tabbrowser-tabbox"
 
  1358 +        <tabbox id="tabbrowser-tabbox"
 
  1348 +                flex="1" tabcontainer="tabbrowser-tabs">
 
  1359 +                flex="1" tabcontainer="tabbrowser-tabs">
 
  1349 +          <tabpanels id="tabbrowser-tabpanels"
 
  1360 +          <tabpanels id="tabbrowser-tabpanels"
 
  1350 +                     flex="1" class="plain" selectedIndex="0"/>
 
  1361 +                     flex="1" class="plain" selectedIndex="0"/>
 
  1351 +        </tabbox>
 
  1362 +        </tabbox>
 
  1384 +      &pointerlockWarning.generic.label;
 
  1395 +      &pointerlockWarning.generic.label;
 
  1385 +    </html:div>
 
  1396 +    </html:div>
 
  1386 +  </html:div>
 
  1397 +  </html:div>
 
  1387 +
 
  1398 +
 
  1388 +  <vbox id="browser-bottombox" layer="true">
 
  1399 +  <vbox id="browser-bottombox" layer="true">
 
  1389 +    <notificationbox id="global-notificationbox" notificationside="bottom"/>
 
  1400 +    <!-- gNotificationBox will be added here lazily. -->
 
  1390 +  </vbox>
 
  1401 +  </vbox>
 
  1391 +
 
  1402 +
 
  1392 +</window>
 
  1403 +</window>
 
  1393 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 
  1404 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 
  1394 --- a/browser/base/jar.mn
 
  1405 --- a/browser/base/jar.mn
 
  1473  #endif
 
  1484  #endif
 
  1474  #if defined(MOZ_WIDGET_COCOA)
 
  1485  #if defined(MOZ_WIDGET_COCOA)
 
  1475 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
 
  1486 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
 
  1476 --- a/browser/components/preferences/in-content/main.js
 
  1487 --- a/browser/components/preferences/in-content/main.js
 
  1477 +++ b/browser/components/preferences/in-content/main.js
 
  1488 +++ b/browser/components/preferences/in-content/main.js
 
  1478 @@ -283,16 +283,23 @@ var gMainPane = {
 
  1489 @@ -289,16 +289,23 @@ var gMainPane = {
 
  1479            this._backoffIndex++ : backoffTimes.length - 1]);
 
  1490            this._backoffIndex++ : backoffTimes.length - 1]);
 
  1480        };
 
  1491        };
 
  1481  
  1492  
  1482        window.setTimeout(() => {
 
  1493        window.setTimeout(() => {
 
  1483          window.requestIdleCallback(pollForDefaultBrowser);
 
  1494          window.requestIdleCallback(pollForDefaultBrowser);
 
  1497      let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore");
 
  1508      let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore");
 
  1498      let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance";
 
  1509      let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance";
 
  1499      performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
 
  1510      performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
 
  1500  
  1511  
  1501      this.updateDefaultPerformanceSettingsPref();
 
  1512      this.updateDefaultPerformanceSettingsPref();
 
  1502 @@ -938,16 +945,27 @@ var gMainPane = {
 
  1513 @@ -1012,16 +1019,27 @@ var gMainPane = {
 
  1503        // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
 
  1514        // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
 
  1504        this._backoffIndex = 0;
 
  1515        this._backoffIndex = 0;
 
  1505  
  1516  
  1506        let shellSvc = getShellService();
 
  1517        let shellSvc = getShellService();
 
  1507        if (!shellSvc)
 
  1518        if (!shellSvc)
 
  1790 +
 
  1801 +
 
  1791 +#endif // nsunixshellservice_h____
 
  1802 +#endif // nsunixshellservice_h____
 
  1792 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 
  1803 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 
  1793 --- a/browser/installer/package-manifest.in
 
  1804 --- a/browser/installer/package-manifest.in
 
  1794 +++ b/browser/installer/package-manifest.in
 
  1805 +++ b/browser/installer/package-manifest.in
 
  1795 @@ -458,16 +458,18 @@
 
  1806 @@ -451,16 +451,18 @@
 
  1796  @RESPATH@/browser/defaults/settings/pinning
 
  1807  @RESPATH@/browser/defaults/settings/pinning
 
  1797  @RESPATH@/browser/defaults/settings/main
 
  1808  @RESPATH@/browser/defaults/settings/main
 
  1798  
  1809  
  1799  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 
  1810  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 
  1800  ; Technically this is an app pref file, but we are keeping it in the original
 
  1811  ; Technically this is an app pref file, but we are keeping it in the original
mozilla