# HG changeset patch

# User msirringhaus@suse.de

# Date 1559300151 -7200

#      Fri May 31 12:55:51 2019 +0200

# Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec

# Parent  428161c3b9599083e1b8710eda1760f1f707ab11

How to apply this patch:

1. Import and apply it

2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul

3. Find editBookmarkPanelDoneButton

4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)

5. hg qrefresh

diff -r 428161c3b959 -r 54d41b0033b8 browser/base/content/browser-kde.xul

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

+++ b/browser/base/content/browser-kde.xul	Fri May 31 12:55:51 2019 +0200

@@ -0,0 +1,1375 @@

+#filter substitution

+<?xml version="1.0"?>

+# -*- Mode: HTML -*-

+#

+# This Source Code Form is subject to the terms of the Mozilla Public

+# License, v. 2.0. If a copy of the MPL was not distributed with this

+# file, You can obtain one at http://mozilla.org/MPL/2.0/.

+

+<!-- The "global.css" stylesheet is imported first to allow other stylesheets to

+     override rules using selectors with the same specificity. This applies to

+     both "content" and "skin" packages, which bug 1385444 will unify later. -->

+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>

+

+<!-- While these stylesheets are defined in Toolkit, they are only used in the

+     main browser window, so we can load them here. Bug 1474241 is on file to

+     consider moving these widgets to the "browser" folder. -->

+<?xml-stylesheet href="chrome://global/content/tabprompts.css" type="text/css"?>

+<?xml-stylesheet href="chrome://global/skin/tabprompts.css" type="text/css"?>

+

+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>

+<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>

+<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css" type="text/css"?>

+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>

+<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>

+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>

+<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>

+<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>

+<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css" type="text/css"?>

+<?xml-stylesheet href="chrome://browser/skin/searchbar.css" type="text/css"?>

+<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>

+<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?>

+

+# All DTD information is stored in a separate file so that it can be shared by

+# hiddenWindow.xul.

+<!DOCTYPE window [

+#include browser-doctype.inc

+]>

+

+<window id="main-window"

+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

+        xmlns:svg="http://www.w3.org/2000/svg"

+        xmlns:html="http://www.w3.org/1999/xhtml"

+        xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

+        title="&mainWindow.title;"

+        title_normal="&mainWindow.title;"

+#ifdef XP_MACOSX

+        title_privatebrowsing="&mainWindow.title;&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"

+        titledefault="&mainWindow.title;"

+        titlemodifier=""

+        titlemodifier_normal=""

+        titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"

+#else

+        title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"

+        titlemodifier="&mainWindow.titlemodifier;"

+        titlemodifier_normal="&mainWindow.titlemodifier;"

+        titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"

+#endif

+#ifdef XP_WIN

+        chromemargin="0,2,2,2"

+#else

+        chromemargin="0,-1,-1,-1"

+#endif

+        tabsintitlebar="true"

+        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"

+        windowtype="navigator:browser"

+        macanimationtype="document"

+        screenX="4" screenY="4"

+        fullscreenbutton="true"

+        sizemode="normal"

+        retargetdocumentfocus="urlbar"

+        persist="screenX screenY width height sizemode"

+#ifdef BROWSER_XHTML

+        mozpersist=""

+#endif

+        >

+

+# All JS files which are needed by browser.xul and other top level windows to

+# support MacOS specific features *must* go into the global-scripts.inc file so

+# that they can be shared with macWindow.inc.xul.

+#include global-scripts.inc

+

+<script>

+  Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);

+  Services.scriptloader.loadSubScript("chrome://browser/content/browser-captivePortal.js", this);

+  Services.scriptloader.loadSubScript("chrome://browser/content/browser-contentblocking.js", this);

+#ifdef MOZ_DATA_REPORTING

+  Services.scriptloader.loadSubScript("chrome://browser/content/browser-data-submission-info-bar.js", this);

+#endif

+#ifndef MOZILLA_OFFICIAL

+  Services.scriptloader.loadSubScript("chrome://browser/content/browser-development-helpers.js", this);

+#endif

+  Services.scriptloader.loadSubScript("chrome://browser/content/browser-media.js", this);

+  Services.scriptloader.loadSubScript("chrome://browser/content/browser-pageActions.js", this);

+  Services.scriptloader.loadSubScript("chrome://browser/content/browser-plugins.js", this);

+  Services.scriptloader.loadSubScript("chrome://browser/content/browser-sidebar.js", this);

+  Services.scriptloader.loadSubScript("chrome://browser/content/browser-tabsintitlebar.js", this);

+  Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this);

+  Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);

+  Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);

+

+  window.onload = gBrowserInit.onLoad.bind(gBrowserInit);

+  window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);

+  window.onclose = WindowIsClosing;

+

+  window.addEventListener("MozBeforeInitialXULLayout",

+    gBrowserInit.onBeforeInitialXULLayout.bind(gBrowserInit), { once: true });

+

+  // The listener of DOMContentLoaded must be set on window, rather than

+  // document, because the window can go away before the event is fired.

+  // In that case, we don't want to initialize anything, otherwise we

+  // may be leaking things because they will never be destroyed after.

+  window.addEventListener("DOMContentLoaded",

+    gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });

+</script>

+

+# All sets except for popupsets (commands, keys, and stringbundles)

+# *must* go into the browser-sets.inc file so that they can be shared with other

+# top level windows in macWindow.inc.xul.

+#include browser-sets.inc

+

+  <popupset id="mainPopupSet">

+    <menupopup id="tabContextMenu"

+               onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);"

+               onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">

+      <menuitem id="context_reloadTab" data-lazy-l10n-id="reload-tab"

+                oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>

+      <menuitem id="context_reloadSelectedTabs" data-lazy-l10n-id="reload-tabs" hidden="true"

+                oncommand="gBrowser.reloadMultiSelectedTabs();"/>

+      <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>

+      <menuitem id="context_toggleMuteSelectedTabs" hidden="true"

+                oncommand="gBrowser.toggleMuteAudioOnMultiSelectedTabs(TabContextMenu.contextTab);"/>

+      <menuitem id="context_pinTab" data-lazy-l10n-id="pin-tab"

+                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>

+      <menuitem id="context_unpinTab" data-lazy-l10n-id="unpin-tab" hidden="true"

+                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>

+      <menuitem id="context_pinSelectedTabs" data-lazy-l10n-id="pin-selected-tabs" hidden="true"

+                oncommand="gBrowser.pinMultiSelectedTabs();"/>

+      <menuitem id="context_unpinSelectedTabs" data-lazy-l10n-id="unpin-selected-tabs" hidden="true"

+                oncommand="gBrowser.unpinMultiSelectedTabs();"/>

+      <menuitem id="context_duplicateTab" data-lazy-l10n-id="duplicate-tab"

+                oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>

+      <menuitem id="context_duplicateTabs" data-lazy-l10n-id="duplicate-tabs"

+                oncommand="TabContextMenu.duplicateSelectedTabs();"/>

+      <menuseparator/>

+      <menuitem id="context_selectAllTabs" data-lazy-l10n-id="select-all-tabs"

+                oncommand="gBrowser.selectAllTabs();"/>

+      <menuitem id="context_bookmarkSelectedTabs"

+                hidden="true"

+                data-lazy-l10n-id="bookmark-selected-tabs"

+                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"/>

+      <menuitem id="context_bookmarkTab"

+                data-lazy-l10n-id="bookmark-tab"

+                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.getUniquePages([TabContextMenu.contextTab]));"/>

+      <menu id="context_reopenInContainer"

+            data-lazy-l10n-id="reopen-in-container"

+            hidden="true">

+        <menupopup oncommand="TabContextMenu.reopenInContainer(event);"

+                   onpopupshowing="TabContextMenu.createReopenInContainerMenu(event);"/>

+      </menu>

+      <menu id="context_moveTabOptions">

+        <menupopup id="moveTabOptionsMenu">

+          <menuitem id="context_moveToStart"

+                    data-lazy-l10n-id="move-to-start"

+                    tbattr="tabbrowser-multiple"

+                    oncommand="gBrowser.moveTabsToStart(TabContextMenu.contextTab);"/>

+          <menuitem id="context_moveToEnd"

+                    data-lazy-l10n-id="move-to-end"

+                    tbattr="tabbrowser-multiple"

+                    oncommand="gBrowser.moveTabsToEnd(TabContextMenu.contextTab);"/>

+          <menuitem id="context_openTabInWindow" data-lazy-l10n-id="move-to-new-window"

+                    tbattr="tabbrowser-multiple"

+                    oncommand="gBrowser.replaceTabsWithWindow(TabContextMenu.contextTab);"/>

+        </menupopup>

+      </menu>

+      <menu id="context_sendTabToDevice"

+            class="sync-ui-item">

+        <menupopup id="context_sendTabToDevicePopupMenu"

+                   onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle, TabContextMenu.contextTab.multiselected);"/>

+      </menu>

+      <menuseparator/>

+      <menuitem id="context_closeTabsToTheEnd" data-lazy-l10n-id="close-tabs-to-the-end"

+                oncommand="gBrowser.removeTabsToTheEndFrom(TabContextMenu.contextTab, {animate: true});"/>

+      <menuitem id="context_closeOtherTabs" data-lazy-l10n-id="close-other-tabs"

+                oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/>

+      <menuitem id="context_undoCloseTab"

+                data-lazy-l10n-id="undo-close-tab"

+                observes="History:UndoCloseTab"/>

+      <menuitem id="context_closeTab" data-lazy-l10n-id="close-tab"

+                oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/>

+      <menuitem id="context_closeSelectedTabs" data-lazy-l10n-id="close-tabs"

+                hidden="true"

+                oncommand="gBrowser.removeMultiSelectedTabs();"/>

+    </menupopup>

+

+    <!-- bug 415444/582485: event.stopPropagation is here for the cloned version

+         of this menupopup -->

+    <menupopup id="backForwardMenu"

+               onpopupshowing="return FillHistoryMenu(event.target);"

+               oncommand="gotoHistoryIndex(event); event.stopPropagation();"

+               onclick="checkForMiddleClick(this, event);"/>

+    <tooltip id="aHTMLTooltip" page="true"/>

+    <tooltip id="remoteBrowserTooltip"/>

+

+    <!-- for search and content formfill/pw manager -->

+

+    <panel is="autocomplete-richlistbox-popup"

+           type="autocomplete-richlistbox"

+           id="PopupAutoComplete"

+           role="group"

+           noautofocus="true"

+           hidden="true"

+           overflowpadding="4"

+           norolluponanchor="true"

+           nomaxresults="true" />

+

+    <!-- for search with one-off buttons -->

+    <panel is="search-autocomplete-richlistbox-popup"

+           type="autocomplete-richlistbox"

+           id="PopupSearchAutoComplete"

+           role="group"

+           noautofocus="true"

+           hidden="true" />

+

+    <!-- for url bar autocomplete -->

+    <panel type="autocomplete-richlistbox"

+           id="PopupAutoCompleteRichResult"

+           role="group"

+           noautofocus="true"

+           hidden="true"

+           flip="none"

+           level="parent"

+           overflowpadding="15" />

+

+    <!-- for date/time picker. consumeoutsideclicks is set to never, so that

+         clicks on the anchored input box are never consumed. -->

+    <panel id="DateTimePickerPanel"

+           type="arrow"

+           hidden="true"

+           orient="vertical"

+           noautofocus="true"

+           norolluponanchor="true"

+           consumeoutsideclicks="never"

+           level="parent"

+           tabspecific="true">

+    </panel>

+

+    <!-- for select dropdowns. The menupopup is what shows the list of options,

+         and the popuponly menulist makes things like the menuactive attributes

+         work correctly on the menupopup. ContentSelectDropdown expects the

+         popuponly menulist to be its immediate parent. -->

+    <menulist popuponly="true" id="ContentSelectDropdown" hidden="true">

+      <menupopup rolluponmousewheel="true"

+                 activateontab="true" position="after_start"

+                 level="parent"

+#ifdef XP_WIN

+                 consumeoutsideclicks="false" ignorekeys="shortcuts"

+#endif

+        />

+    </menulist>

+

+    <!-- for invalid form error message -->

+    <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent">

+      <description/>

+    </panel>

+

+    <panel id="editBookmarkPanel"

+           type="arrow"

+           orient="vertical"

+           ignorekeys="true"

+           hidden="true"

+           tabspecific="true"

+           aria-labelledby="editBookmarkPanelTitle">

+      <box class="panel-header">

+        <label id="editBookmarkPanelTitle"/>

+        <toolbarbutton id="editBookmarkPanelInfoButton" oncommand="StarUI.toggleRecommendation();" >

+          <image/>

+        </toolbarbutton>

+      </box>

+      <html:div id="editBookmarkPanelInfoArea">

+        <html:div id="editBookmarkPanelRecommendation"></html:div>

+        <html:div id="editBookmarkPanelFaviconContainer">

+          <html:img id="editBookmarkPanelFavicon"/>

+        </html:div>

+        <html:div id="editBookmarkPanelImage"></html:div>

+      </html:div>

+#include ../../components/places/content/editBookmarkPanel.inc.xul

+      <vbox id="editBookmarkPanelBottomContent"

+            flex="1">

+        <checkbox id="editBookmarkPanel_showForNewBookmarks"

+                  label="&editBookmark.showForNewBookmarks.label;"

+                  accesskey="&editBookmark.showForNewBookmarks.accesskey;"

+                  oncommand="StarUI.onShowForNewBookmarksCheckboxCommand();"/>

+      </vbox>

+      <hbox id="editBookmarkPanelBottomButtons"

+            class="panel-footer"

+            style="min-width: &editBookmark.panel.width;;">

+#ifdef XP_UNIX

+        <button id="editBookmarkPanelDoneButton"

+                class="editBookmarkPanelBottomButton"

+                label="&editBookmark.done.label;"

+                default="true"

+                oncommand="StarUI.panel.hidePopup();"/>

+        <button id="editBookmarkPanelRemoveButton"

+                class="editBookmarkPanelBottomButton"

+                oncommand="StarUI.removeBookmarkButtonCommand();"/>

+#else

+        <button id="editBookmarkPanelRemoveButton"

+                class="editBookmarkPanelBottomButton"

+                oncommand="StarUI.removeBookmarkButtonCommand();"/>

+        <button id="editBookmarkPanelDoneButton"

+                class="editBookmarkPanelBottomButton"

+                label="&editBookmark.done.label;"

+                default="true"

+                oncommand="StarUI.panel.hidePopup();"/>

+#endif

+      </hbox>

+    </panel>

+

+    <!-- UI tour experience -->

+    <panel id="UITourTooltip"

+           type="arrow"

+           hidden="true"

+           noautofocus="true"

+           noautohide="true"

+           align="start"

+           orient="vertical"

+           role="alert">

+     <vbox>

+      <hbox id="UITourTooltipBody">

+        <image id="UITourTooltipIcon"/>

+        <vbox flex="1">

+          <hbox id="UITourTooltipTitleContainer">

+            <label id="UITourTooltipTitle" flex="1"/>

+            <toolbarbutton id="UITourTooltipClose" class="close-icon"

+                           tooltiptext="&uiTour.infoPanel.close;"/>

+          </hbox>

+          <description id="UITourTooltipDescription" flex="1"/>

+        </vbox>

+      </hbox>

+      <hbox id="UITourTooltipButtons" flex="1" align="center"/>

+     </vbox>

+    </panel>

+    <!-- type="default" forces frames to be created so that the panel's size can be determined -->

+    <panel id="UITourHighlightContainer"

+           type="default"

+           hidden="true"

+           noautofocus="true"

+           noautohide="true"

+           flip="none"

+           consumeoutsideclicks="false"

+           mousethrough="always">

+      <box id="UITourHighlight"></box>

+    </panel>

+

+    <panel id="sidebarMenu-popup"

+           class="cui-widget-panel"

+           role="group"

+           type="arrow"

+           hidden="true"

+           flip="slide"

+           orient="vertical"

+           position="bottomcenter topleft">

+      <toolbarbutton id="sidebar-switcher-bookmarks"

+                     type="checkbox"

+                     label="&bookmarksButton.label;"

+                     class="subviewbutton subviewbutton-iconic"

+                     key="viewBookmarksSidebarKb"

+                     oncommand="SidebarUI.show('viewBookmarksSidebar');"/>

+      <toolbarbutton id="sidebar-switcher-history"

+                     type="checkbox"

+                     label="&historyButton.label;"

+                     class="subviewbutton subviewbutton-iconic"

+                     key="key_gotoHistory"

+                     oncommand="SidebarUI.show('viewHistorySidebar');"/>

+      <toolbarbutton id="sidebar-switcher-tabs"

+                     type="checkbox"

+                     label="&syncedTabs.sidebar.label;"

+                     class="subviewbutton subviewbutton-iconic sync-ui-item"

+                     oncommand="SidebarUI.show('viewTabsSidebar');"/>

+      <toolbarseparator/>

+      <!-- Extension toolbarbuttons go here. -->

+      <toolbarseparator id="sidebar-extensions-separator"/>

+      <toolbarbutton id="sidebar-reverse-position"

+                     class="subviewbutton"

+                     oncommand="SidebarUI.reversePosition()"/>

+      <toolbarseparator/>

+      <toolbarbutton label="&sidebarMenuClose.label;"

+                     class="subviewbutton"

+                     oncommand="SidebarUI.hide()"/>

+    </panel>

+

+    <menupopup id="toolbar-context-menu"

+               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator')); ToolbarContextMenu.updateDownloadsAutoHide(this); ToolbarContextMenu.updateExtension(this)">

+      <menuitem oncommand="ToolbarContextMenu.openAboutAddonsForContextAction(this.parentElement)"

+                accesskey="&customizeMenu.manageExtension.accesskey;"

+                label="&customizeMenu.manageExtension.label;"

+                contexttype="toolbaritem"

+                class="customize-context-manageExtension"/>

+      <menuitem oncommand="ToolbarContextMenu.removeExtensionForContextAction(this.parentElement)"

+                accesskey="&customizeMenu.removeExtension.accesskey;"

+                label="&customizeMenu.removeExtension.label;"

+                contexttype="toolbaritem"

+                class="customize-context-removeExtension"/>

+      <menuitem oncommand="ToolbarContextMenu.reportExtensionForContextAction(this.parentElement, 'toolbar_context_menu')"

+                accesskey="&customizeMenu.reportExtension.accesskey;"

+                label="&customizeMenu.reportExtension.label;"

+                contexttype="toolbaritem"

+                class="customize-context-reportExtension"/>

+      <menuseparator/>

+      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"

+                accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"

+                label="&customizeMenu.pinToOverflowMenu.label;"

+                contexttype="toolbaritem"

+                class="customize-context-moveToPanel"/>

+      <menuitem id="toolbar-context-autohide-downloads-button"

+                oncommand="ToolbarContextMenu.onDownloadsAutoHideChange(event);"

+                type="checkbox"

+                accesskey="&customizeMenu.autoHideDownloadsButton.accesskey;"

+                label="&customizeMenu.autoHideDownloadsButton.label;"

+                contexttype="toolbaritem"/>

+      <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"

+                accesskey="&customizeMenu.removeFromToolbar.accesskey;"

+                label="&customizeMenu.removeFromToolbar.label;"

+                contexttype="toolbaritem"

+                class="customize-context-removeFromToolbar"/>

+      <menuitem id="toolbar-context-reloadSelectedTab"

+                contexttype="tabbar"

+                oncommand="gBrowser.reloadMultiSelectedTabs();"

+                data-lazy-l10n-id="toolbar-context-menu-reload-selected-tab"/>

+      <menuitem id="toolbar-context-reloadSelectedTabs"

+                contexttype="tabbar"

+                oncommand="gBrowser.reloadMultiSelectedTabs();"

+                data-lazy-l10n-id="toolbar-context-menu-reload-selected-tabs"/>

+      <menuitem id="toolbar-context-bookmarkSelectedTab"

+                contexttype="tabbar"

+                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"

+                data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tab"/>

+      <menuitem id="toolbar-context-bookmarkSelectedTabs"

+                contexttype="tabbar"

+                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"

+                data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tabs"/>

+      <menuitem id="toolbar-context-selectAllTabs"

+                contexttype="tabbar"

+                oncommand="gBrowser.selectAllTabs();"

+                data-lazy-l10n-id="toolbar-context-menu-select-all-tabs"/>

+      <menuitem id="toolbar-context-undoCloseTab"

+                contexttype="tabbar"

+                data-lazy-l10n-id="toolbar-context-menu-undo-close-tab"

+                observes="History:UndoCloseTab"/>

+      <menuseparator/>

+      <menuseparator id="viewToolbarsMenuSeparator"/>

+      <!-- XXXgijs: we're using oncommand handler here to avoid the event being

+                    redirected to the command element, thus preventing

+                    listeners on the menupopup or further up the tree from

+                    seeing the command event pass by. The observes attribute is

+                    here so that the menuitem is still disabled and re-enabled

+                    correctly. -->

+      <menuitem oncommand="gCustomizeMode.enter()"

+                observes="cmd_CustomizeToolbars"

+                class="viewCustomizeToolbar"

+                label="&viewCustomizeToolbar.label;"

+                accesskey="&viewCustomizeToolbar.accesskey;"/>

+    </menupopup>

+

+    <menupopup id="blockedPopupOptions"