firefox-kde.patch
changeset 1068 70cd69cfa868
parent 1067 735b140fb042
child 1074 4b99400f6d17
equal deleted inserted replaced
1067:735b140fb042 1068:70cd69cfa868
     1 # HG changeset patch
     1 # HG changeset patch
     2 # Parent  9db8523a81b9b43b952541cd47fc95d472f1eecf
     2 # Parent  0629fb9c6879e14c1b5e3cbff53b0d44371f0127
     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,1293 @@
     8 @@ -0,0 +1,1291 @@
     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
    19 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
    19 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
    20 +<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
    20 +<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
    21 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
    21 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
    22 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
    22 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
    23 +<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css"?>
    23 +<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css"?>
       
    24 +<?xml-stylesheet href="chrome://browser/skin/searchbar.css"?>
    24 +<?xml-stylesheet href="chrome://browser/skin/places/places.css"?>
    25 +<?xml-stylesheet href="chrome://browser/skin/places/places.css"?>
    25 +<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
    26 +<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
    26 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
    27 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
    27 +<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>
    28 +<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>
    28 +<?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?>
    29 +<?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?>
   105 +               onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);"
   106 +               onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);"
   106 +               onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
   107 +               onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
   107 +      <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
   108 +      <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
   108 +                oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
   109 +                oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
   109 +      <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>
   110 +      <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>
       
   111 +      <menuitem id="context_toggleMuteSelectedTabs" hidden="true"
       
   112 +                oncommand="gBrowser.toggleMuteAudioOnMultiSelectedTabs(TabContextMenu.contextTab);"/>
   110 +      <menuseparator/>
   113 +      <menuseparator/>
   111 +      <menuitem id="context_pinTab" label="&pinTab.label;"
   114 +      <menuitem id="context_pinTab" label="&pinTab.label;"
   112 +                accesskey="&pinTab.accesskey;"
   115 +                accesskey="&pinTab.accesskey;"
   113 +                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
   116 +                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
   114 +      <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true"
   117 +      <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true"
   115 +                accesskey="&unpinTab.accesskey;"
   118 +                accesskey="&unpinTab.accesskey;"
   116 +                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
   119 +                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
   117 +      <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
   120 +      <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
   118 +                accesskey="&duplicateTab.accesskey;"
   121 +                accesskey="&duplicateTab.accesskey;"
   119 +                oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
   122 +                oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
       
   123 +      <menu id="context_reopenInContainer"
       
   124 +            label="&reopenInContainer.label;"
       
   125 +            accesskey="&reopenInContainer.accesskey;"
       
   126 +            hidden="true">
       
   127 +        <menupopup oncommand="reopenInContainer(event);"
       
   128 +                   onpopupshowing="return createReopenInContainerMenu(event);" />
       
   129 +      </menu>
   120 +      <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
   130 +      <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
   121 +                accesskey="&moveToNewWindow.accesskey;"
   131 +                accesskey="&moveToNewWindow.accesskey;"
   122 +                tbattr="tabbrowser-multiple"
   132 +                tbattr="tabbrowser-multiple"
   123 +                oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
   133 +                oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
   124 +      <menuseparator id="context_sendTabToDevice_separator" class="sync-ui-item"/>
   134 +      <menuseparator id="context_sendTabToDevice_separator" class="sync-ui-item"/>
   145 +                label="&undoCloseTab.label;"
   155 +                label="&undoCloseTab.label;"
   146 +                accesskey="&undoCloseTab.accesskey;"
   156 +                accesskey="&undoCloseTab.accesskey;"
   147 +                observes="History:UndoCloseTab"/>
   157 +                observes="History:UndoCloseTab"/>
   148 +      <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;"
   158 +      <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;"
   149 +                oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/>
   159 +                oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/>
       
   160 +      <menuitem id="context_closeSelectedTabs" label="&closeSelectedTabs.label;"
       
   161 +                hidden="true" accesskey="&closeSelectedTabs.accesskey;"
       
   162 +                oncommand="gBrowser.removeMultiSelectedTabs();"/>
   150 +    </menupopup>
   163 +    </menupopup>
   151 +
   164 +
   152 +    <!-- bug 415444/582485: event.stopPropagation is here for the cloned version
   165 +    <!-- bug 415444/582485: event.stopPropagation is here for the cloned version
   153 +         of this menupopup -->
   166 +         of this menupopup -->
   154 +    <menupopup id="backForwardMenu"
   167 +    <menupopup id="backForwardMenu"
   224 +           ignorekeys="true"
   237 +           ignorekeys="true"
   225 +           hidden="true"
   238 +           hidden="true"
   226 +           tabspecific="true"
   239 +           tabspecific="true"
   227 +           onpopupshown="StarUI.panelShown(event);"
   240 +           onpopupshown="StarUI.panelShown(event);"
   228 +           aria-labelledby="editBookmarkPanelTitle">
   241 +           aria-labelledby="editBookmarkPanelTitle">
   229 +      <row id="editBookmarkPanelHeader" align="center" hidden="true">
   242 +      <box class="panel-header">
   230 +        <vbox align="center">
   243 +        <label id="editBookmarkPanelTitle"/>
   231 +          <image id="editBookmarkPanelStarIcon"/>
   244 +      </box>
   232 +        </vbox>
   245 +      <html:div id="editBookmarkPanelFaviconContainer">
   233 +        <vbox>
   246 +        <html:img id="editBookmarkPanelFavicon"/>
   234 +          <label id="editBookmarkPanelTitle"/>
   247 +      </html:div>
   235 +          <description id="editBookmarkPanelDescription"/>
   248 +      <box id="editBookmarkPanelImage"/>
   236 +        </vbox>
       
   237 +      </row>
       
   238 +#include ../../components/places/content/editBookmarkPanel.inc.xul
   249 +#include ../../components/places/content/editBookmarkPanel.inc.xul
   239 +      <hbox id="editBookmarkPanelBottomButtons" pack="end">
   250 +      <hbox id="editBookmarkPanelBottomButtons"
       
   251 +            style="min-width: 30em;">
   240 +#ifdef XP_UNIX
   252 +#ifdef XP_UNIX
   241 +        <button id="editBookmarkPanelDoneButton"
   253 +        <button id="editBookmarkPanelDoneButton"
   242 +                class="editBookmarkPanelBottomButton"
   254 +                class="editBookmarkPanelBottomButton"
   243 +                label="&editBookmark.done.label;"
   255 +                label="&editBookmark.done.label;"
   244 +                default="true"
   256 +                default="true"
   245 +                oncommand="StarUI.panel.hidePopup();"/>
   257 +                oncommand="StarUI.panel.hidePopup();"/>
   246 +        <button id="editBookmarkPanelRemoveButton"
   258 +        <button id="editBookmarkPanelRemoveButton"
   247 +                class="editBookmarkPanelBottomButton"
   259 +                class="editBookmarkPanelBottomButton"
   248 +                oncommand="StarUI.removeBookmarkButtonCommand();"
   260 +                oncommand="StarUI.removeBookmarkButtonCommand();"/>
   249 +                accesskey="&editBookmark.removeBookmark.accessKey;"/>
       
   250 +#else
   261 +#else
   251 +        <button id="editBookmarkPanelRemoveButton"
   262 +        <button id="editBookmarkPanelRemoveButton"
   252 +                class="editBookmarkPanelBottomButton"
   263 +                class="editBookmarkPanelBottomButton"
   253 +                oncommand="StarUI.removeBookmarkButtonCommand();"
   264 +                oncommand="StarUI.removeBookmarkButtonCommand();"/>
   254 +                accesskey="&editBookmark.removeBookmark.accessKey;"/>
       
   255 +        <button id="editBookmarkPanelDoneButton"
   265 +        <button id="editBookmarkPanelDoneButton"
   256 +                class="editBookmarkPanelBottomButton"
   266 +                class="editBookmarkPanelBottomButton"
   257 +                label="&editBookmark.done.label;"
   267 +                label="&editBookmark.done.label;"
   258 +                default="true"
   268 +                default="true"
   259 +                oncommand="StarUI.panel.hidePopup();"/>
   269 +                oncommand="StarUI.panel.hidePopup();"/>
   338 +                     class="subviewbutton"
   348 +                     class="subviewbutton"
   339 +                     oncommand="SidebarUI.hide()"/>
   349 +                     oncommand="SidebarUI.hide()"/>
   340 +    </panel>
   350 +    </panel>
   341 +
   351 +
   342 +    <menupopup id="toolbar-context-menu"
   352 +    <menupopup id="toolbar-context-menu"
   343 +               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
   353 +               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator')); UpdateDownloadsAutoHide(this); UpdateManageExtension(this)">
       
   354 +      <menuitem oncommand="openAboutAddonsForContextAction(this.parentElement)"
       
   355 +                accesskey="&customizeMenu.manageExtension.accesskey;"
       
   356 +                label="&customizeMenu.manageExtension.label;"
       
   357 +                contexttype="toolbaritem"
       
   358 +                class="customize-context-manageExtension"/>
       
   359 +      <menuseparator/>
   344 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
   360 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
   345 +                accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
   361 +                accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
   346 +                label="&customizeMenu.pinToOverflowMenu.label;"
   362 +                label="&customizeMenu.pinToOverflowMenu.label;"
   347 +                contexttype="toolbaritem"
   363 +                contexttype="toolbaritem"
   348 +                class="customize-context-moveToPanel"/>
   364 +                class="customize-context-moveToPanel"/>
       
   365 +      <menuitem oncommand="onDownloadsAutoHideChange(event)"
       
   366 +                type="checkbox"
       
   367 +                accesskey="&customizeMenu.autoHideDownloadsButton.accesskey;"
       
   368 +                label="&customizeMenu.autoHideDownloadsButton.label;"
       
   369 +                contexttype="toolbaritem"
       
   370 +                class="customize-context-autoHide"/>
   349 +      <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
   371 +      <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
   350 +                accesskey="&customizeMenu.removeFromToolbar.accesskey;"
   372 +                accesskey="&customizeMenu.removeFromToolbar.accesskey;"
   351 +                label="&customizeMenu.removeFromToolbar.label;"
   373 +                label="&customizeMenu.removeFromToolbar.label;"
   352 +                contexttype="toolbaritem"
   374 +                contexttype="toolbaritem"
   353 +                class="customize-context-removeFromToolbar"/>
   375 +                class="customize-context-removeFromToolbar"/>
   420 +    </menupopup>
   442 +    </menupopup>
   421 +
   443 +
   422 +#include ../../components/places/content/placesContextMenu.inc.xul
   444 +#include ../../components/places/content/placesContextMenu.inc.xul
   423 +
   445 +
   424 +    <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top">
   446 +    <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top">
   425 +      <hbox>
   447 +      <hbox id="ctrlTab-previews"/>
   426 +        <button class="ctrlTab-preview" flex="1"/>
   448 +      <hbox id="ctrlTab-showAll-container" pack="center"/>
   427 +        <button class="ctrlTab-preview" flex="1"/>
       
   428 +        <button class="ctrlTab-preview" flex="1"/>
       
   429 +        <button class="ctrlTab-preview" flex="1"/>
       
   430 +        <button class="ctrlTab-preview" flex="1"/>
       
   431 +        <button class="ctrlTab-preview" flex="1"/>
       
   432 +      </hbox>
       
   433 +      <hbox pack="center">
       
   434 +        <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/>
       
   435 +      </hbox>
       
   436 +    </panel>
   449 +    </panel>
   437 +
   450 +
   438 +    <panel id="pageActionPanel"
   451 +    <panel id="pageActionPanel"
   439 +           class="cui-widget-panel"
   452 +           class="cui-widget-panel"
   440 +           role="group"
   453 +           role="group"
   458 +                   class="PanelUI-subView">
   471 +                   class="PanelUI-subView">
   459 +          <vbox class="panel-subview-body"/>
   472 +          <vbox class="panel-subview-body"/>
   460 +        </panelview>
   473 +        </panelview>
   461 +      </panelmultiview>
   474 +      </panelmultiview>
   462 +    </panel>
   475 +    </panel>
   463 +    <panel id="pageActionFeedback"
   476 +
       
   477 +    <panel id="confirmation-hint"
   464 +           role="alert"
   478 +           role="alert"
   465 +           type="arrow"
   479 +           type="arrow"
   466 +           hidden="true"
   480 +           hidden="true"
   467 +           flip="slide"
   481 +           flip="slide"
   468 +           position="bottomcenter topright"
   482 +           position="bottomcenter topright"
   469 +           tabspecific="true"
   483 +           tabspecific="true"
   470 +           noautofocus="true"
   484 +           noautofocus="true">
   471 +           copyURLFeedback="&copyURLFeedback.label;"
   485 +      <hbox id="confirmation-hint-checkmark-animation-container">
   472 +           sendToDeviceFeedback="&sendToDeviceFeedback.label;"
   486 +        <image id="confirmation-hint-checkmark-image"/>
   473 +           sendToDeviceOfflineFeedback="&sendToDeviceOfflineFeedback.label;">
       
   474 +      <hbox id="pageActionFeedbackAnimatableBox">
       
   475 +        <image id="pageActionFeedbackAnimatableImage"/>
       
   476 +      </hbox>
   487 +      </hbox>
   477 +      <label id="pageActionFeedbackMessage"/>
   488 +      <label id="confirmation-hint-message"/>
   478 +    </panel>
   489 +    </panel>
   479 +
   490 +
   480 +    <menupopup id="pageActionContextMenu"
   491 +    <menupopup id="pageActionContextMenu"
   481 +               onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);">
   492 +               onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);">
   482 +      <menuitem class="pageActionContextMenuItem builtInUnpinned"
   493 +      <menuitem class="pageActionContextMenuItem builtInUnpinned"
   522 +#include popup-notifications.inc
   533 +#include popup-notifications.inc
   523 +
   534 +
   524 +#include ../../components/customizableui/content/panelUI.inc.xul
   535 +#include ../../components/customizableui/content/panelUI.inc.xul
   525 +#include ../../components/controlcenter/content/panel.inc.xul
   536 +#include ../../components/controlcenter/content/panel.inc.xul
   526 +#include ../../components/downloads/content/downloadsPanel.inc.xul
   537 +#include ../../components/downloads/content/downloadsPanel.inc.xul
       
   538 +#include browser-allTabsMenu.inc.xul
   527 +
   539 +
   528 +    <hbox id="downloads-animation-container" mousethrough="always">
   540 +    <hbox id="downloads-animation-container" mousethrough="always">
   529 +      <vbox id="downloads-notification-anchor" hidden="true">
   541 +      <vbox id="downloads-notification-anchor" hidden="true">
   530 +        <vbox id="downloads-indicator-notification"/>
   542 +        <vbox id="downloads-indicator-notification"/>
   531 +      </vbox>
   543 +      </vbox>
   673 +                     cui-areatype="toolbar"
   685 +                     cui-areatype="toolbar"
   674 +                     removable="true"/>
   686 +                     removable="true"/>
   675 +
   687 +
   676 +      <toolbarbutton id="alltabs-button"
   688 +      <toolbarbutton id="alltabs-button"
   677 +                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button badged-button"
   689 +                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button badged-button"
   678 +                     type="menu"
   690 +                     oncommand="gTabsPanel.showAllTabsPanel();"
   679 +                     label="&listAllTabs.label;"
   691 +                     label="&listAllTabs.label;"
   680 +                     tooltiptext="&listAllTabs.label;"
   692 +                     tooltiptext="&listAllTabs.label;"
   681 +                     removable="false">
   693 +                     removable="false"/>
   682 +        <menupopup id="alltabs-popup"
       
   683 +                   position="after_end">
       
   684 +          <menuitem id="alltabs_undoCloseTab"
       
   685 +                    key="key_undoCloseTab"
       
   686 +                    label="&undoCloseTab.label;"
       
   687 +                    observes="History:UndoCloseTab"/>
       
   688 +          <menuseparator id="alltabs-popup-separator-1"/>
       
   689 +          <menu id="alltabs_containersTab"
       
   690 +                label="&newUserContext.label;">
       
   691 +            <menupopup id="alltabs_containersMenuTab" />
       
   692 +          </menu>
       
   693 +          <menuseparator id="alltabs-popup-separator-2"/>
       
   694 +          <menu id="alltabs_hiddenTabs"
       
   695 +                label="&hiddenTabs.label;">
       
   696 +            <menupopup id="alltabs_hiddenTabsMenu"/>
       
   697 +          </menu>
       
   698 +          <menuseparator id="alltabs-popup-separator-3"/>
       
   699 +        </menupopup>
       
   700 +      </toolbarbutton>
       
   701 +
   694 +
   702 +      <hbox class="titlebar-placeholder" type="post-tabs"
   695 +      <hbox class="titlebar-placeholder" type="post-tabs"
   703 +            ordinal="1000"
   696 +            ordinal="1000"
   704 +            skipintoolbarset="true"/>
   697 +            skipintoolbarset="true"/>
   705 +
   698 +
   776 +                       ondrop="homeButtonObserver.onDrop(event)"
   769 +                       ondrop="homeButtonObserver.onDrop(event)"
   777 +                       ondragexit="homeButtonObserver.onDragExit(event)"
   770 +                       ondragexit="homeButtonObserver.onDragExit(event)"
   778 +                       key="goHome"
   771 +                       key="goHome"
   779 +                       onclick="BrowserGoHome(event);"
   772 +                       onclick="BrowserGoHome(event);"
   780 +                       cui-areatype="toolbar"
   773 +                       cui-areatype="toolbar"
   781 +                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
   774 +                       aboutHomeOverrideTooltip="&homeButton.defaultPage.tooltip;"/>
   782 +        <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
   775 +        <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
   783 +        <toolbaritem id="urlbar-container" flex="400" persist="width"
   776 +        <toolbaritem id="urlbar-container" flex="400" persist="width"
   784 +                     removable="false"
   777 +                     removable="false"
   785 +                     class="chromeclass-location" overflows="false">
   778 +                     class="chromeclass-location" overflows="false">
   786 +            <textbox id="urlbar" flex="1"
   779 +            <textbox id="urlbar" flex="1"
   824 +                         tooltiptext="&urlbar.screenBlocked.tooltip;"/>
   817 +                         tooltiptext="&urlbar.screenBlocked.tooltip;"/>
   825 +                  <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button"
   818 +                  <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button"
   826 +                         tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/>
   819 +                         tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/>
   827 +                  <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
   820 +                  <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
   828 +                         tooltiptext="&urlbar.popupBlocked.tooltip;"/>
   821 +                         tooltiptext="&urlbar.popupBlocked.tooltip;"/>
       
   822 +                  <image data-permission-id="autoplay-media" class="blocked-permission-icon autoplay-media-icon" role="button"
       
   823 +                         tooltiptext="&urlbar.autoplayMediaBlocked.tooltip;"/>
   829 +                  <image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button"
   824 +                  <image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button"
   830 +                         tooltiptext="&urlbar.canvasBlocked.tooltip;"/>
   825 +                         tooltiptext="&urlbar.canvasBlocked.tooltip;"/>
   831 +                  <image data-permission-id="plugin:flash" class="blocked-permission-icon plugin-icon" role="button"
   826 +                  <image data-permission-id="plugin:flash" class="blocked-permission-icon plugin-icon" role="button"
   832 +                         tooltiptext="&urlbar.flashPluginBlocked.tooltip;"/>
   827 +                         tooltiptext="&urlbar.flashPluginBlocked.tooltip;"/>
   833 +                  <image data-permission-id="midi" class="blocked-permission-icon midi-icon" role="button"
   828 +                  <image data-permission-id="midi" class="blocked-permission-icon midi-icon" role="button"
   840 +                     align="center">
   835 +                     align="center">
   841 +                  <image id="default-notification-icon" class="notification-anchor-icon" role="button"
   836 +                  <image id="default-notification-icon" class="notification-anchor-icon" role="button"
   842 +                         tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
   837 +                         tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
   843 +                  <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
   838 +                  <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
   844 +                         tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/>
   839 +                         tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/>
       
   840 +                  <image id="autoplay-media-notification-icon" class="notification-anchor-icon autoplay-media-icon" role="button"
       
   841 +                         tooltiptext="&urlbar.autoplayNotificationAnchor.tooltip;"/>
   845 +                  <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
   842 +                  <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
   846 +                         tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/>
   843 +                         tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/>
   847 +                  <image id="canvas-notification-icon" class="notification-anchor-icon" role="button"
   844 +                  <image id="canvas-notification-icon" class="notification-anchor-icon" role="button"
   848 +                         tooltiptext="&urlbar.canvasNotificationAnchor.tooltip;"/>
   845 +                         tooltiptext="&urlbar.canvasNotificationAnchor.tooltip;"/>
   849 +                  <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
   846 +                  <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
  1135 +                container="true">
  1132 +                container="true">
  1136 +            <menupopup id="BMB_bookmarksToolbarPopup"
  1133 +            <menupopup id="BMB_bookmarksToolbarPopup"
  1137 +                       placespopup="true"
  1134 +                       placespopup="true"
  1138 +                       context="placesContext"
  1135 +                       context="placesContext"
  1139 +                       onpopupshowing="if (!this.parentNode._placesView)
  1136 +                       onpopupshowing="if (!this.parentNode._placesView)
  1140 +                                         new PlacesMenu(event, 'place:folder=TOOLBAR',
  1137 +                                         new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.toolbarGuid}`,
  1141 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);">
  1138 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);">
  1142 +              <menuitem id="BMB_viewBookmarksToolbar"
  1139 +              <menuitem id="BMB_viewBookmarksToolbar"
  1143 +                        class="menuitem-iconic subviewbutton"
  1140 +                        class="menuitem-iconic subviewbutton"
  1144 +                        label-show="&viewBookmarksToolbar.label;"
  1141 +                        label-show="&viewBookmarksToolbar.label;"
  1145 +                        label-hide="&hideBookmarksToolbar.label;"
  1142 +                        label-hide="&hideBookmarksToolbar.label;"
  1154 +                container="true">
  1151 +                container="true">
  1155 +            <menupopup id="BMB_unsortedBookmarksPopup"
  1152 +            <menupopup id="BMB_unsortedBookmarksPopup"
  1156 +                       placespopup="true"
  1153 +                       placespopup="true"
  1157 +                       context="placesContext"
  1154 +                       context="placesContext"
  1158 +                       onpopupshowing="if (!this.parentNode._placesView)
  1155 +                       onpopupshowing="if (!this.parentNode._placesView)
  1159 +                                         new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
  1156 +                                         new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.unfiledGuid}`,
  1160 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
  1157 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
  1161 +          </menu>
  1158 +          </menu>
  1162 +          <menu id="BMB_mobileBookmarks"
  1159 +          <menu id="BMB_mobileBookmarks"
  1163 +                class="menu-iconic bookmark-item subviewbutton"
  1160 +                class="menu-iconic bookmark-item subviewbutton"
  1164 +                label="&bookmarksMenuButton.mobile.label;"
  1161 +                label="&bookmarksMenuButton.mobile.label;"
  1166 +                container="true">
  1163 +                container="true">
  1167 +            <menupopup id="BMB_mobileBookmarksPopup"
  1164 +            <menupopup id="BMB_mobileBookmarksPopup"
  1168 +                       placespopup="true"
  1165 +                       placespopup="true"
  1169 +                       context="placesContext"
  1166 +                       context="placesContext"
  1170 +                       onpopupshowing="if (!this.parentNode._placesView)
  1167 +                       onpopupshowing="if (!this.parentNode._placesView)
  1171 +                                         new PlacesMenu(event, 'place:folder=MOBILE_BOOKMARKS',
  1168 +                                         new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.mobileGuid}`,
  1172 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
  1169 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
  1173 +          </menu>
  1170 +          </menu>
  1174 +
  1171 +
  1175 +          <menuseparator/>
  1172 +          <menuseparator/>
  1176 +          <!-- Bookmarks menu items will go here -->
  1173 +          <!-- Bookmarks menu items will go here -->
  1222 +
  1219 +
  1223 +      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
  1220 +      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
  1224 +      <vbox id="appcontent" flex="1">
  1221 +      <vbox id="appcontent" flex="1">
  1225 +        <notificationbox id="high-priority-global-notificationbox" notificationside="top"/>
  1222 +        <notificationbox id="high-priority-global-notificationbox" notificationside="top"/>
  1226 +        <tabbox id="tabbrowser-tabbox"
  1223 +        <tabbox id="tabbrowser-tabbox"
  1227 +                    flex="1" eventnode="document" tabcontainer="tabbrowser-tabs"
  1224 +                flex="1" eventnode="document" tabcontainer="tabbrowser-tabs">
  1228 +                    onselect="if (event.target.localName == 'tabpanels') gBrowser.updateCurrentBrowser();">
  1225 +          <tabpanels id="tabbrowser-tabpanels"
  1229 +          <tabpanels flex="1" class="plain" selectedIndex="0" id="tabbrowser-tabpanels">
  1226 +                     flex="1" class="plain" selectedIndex="0"
       
  1227 +                     onselect="if (event.target == this) gBrowser.updateCurrentBrowser();">
  1230 +            <notificationbox flex="1" notificationside="top">
  1228 +            <notificationbox flex="1" notificationside="top">
  1231 +              <!-- Set large flex to allow the devtools toolbox to set a flex attribute.
  1229 +              <!-- Set large flex to allow the devtools toolbox to set a flex attribute.
  1232 +                   We don't want the toolbox to actually take up free space, but we do want it to collapse when the window shrinks, and with flex=0 it can't.
  1230 +                   We don't want the toolbox to actually take up free space, but we do want it to collapse when the window shrinks, and with flex=0 it can't.
  1233 +                   When the toolbox is on the bottom it's a sibling of browserSidebarContainer,
  1231 +                   When the toolbox is on the bottom it's a sibling of browserSidebarContainer,
  1234 +                   and when it's on the side it's a sibling of browserContainer.  -->
  1232 +                   and when it's on the side it's a sibling of browserContainer.  -->