summaryrefslogtreecommitdiffstats
path: root/webbrowser/base
diff options
context:
space:
mode:
Diffstat (limited to 'webbrowser/base')
-rw-r--r--webbrowser/base/content/baseMenuOverlay.xul57
1 files changed, 7 insertions, 50 deletions
diff --git a/webbrowser/base/content/baseMenuOverlay.xul b/webbrowser/base/content/baseMenuOverlay.xul
index bccdec2..3eaac02 100644
--- a/webbrowser/base/content/baseMenuOverlay.xul
+++ b/webbrowser/base/content/baseMenuOverlay.xul
@@ -1,9 +1,5 @@
<?xml version="1.0"?>
-# 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/.
-
<!DOCTYPE overlay [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
%brandDTD;
@@ -16,43 +12,20 @@
<script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
-#ifdef XP_MACOSX
-<!-- nsMenuBarX hides these and uses them to build the Application menu.
- When using Carbon widgets for Mac OS X widgets, some of these are not
- used as they only apply to Cocoa widget builds. All version of Firefox
- through Firefox 2 will use Carbon widgets. -->
- <menupopup id="menu_ToolsPopup">
- <menuitem id="menu_preferences" label="&preferencesCmdMac.label;" key="key_preferencesCmdMac" oncommand="openPreferences();"/>
- <menuitem id="menu_mac_services" label="&servicesMenuMac.label;"/>
- <menuitem id="menu_mac_hide_app" label="&hideThisAppCmdMac.label;" key="key_hideThisAppCmdMac"/>
- <menuitem id="menu_mac_hide_others" label="&hideOtherAppsCmdMac.label;" key="key_hideOtherAppsCmdMac"/>
- <menuitem id="menu_mac_show_all" label="&showAllAppsCmdMac.label;"/>
- </menupopup>
-<!-- Mac window menu -->
-#include ../../../../toolkit/content/macWindowMenu.inc
-#endif
-#ifdef XP_WIN
- <menu id="helpMenu"
- label="&helpMenuWin.label;"
- accesskey="&helpMenuWin.accesskey;">
-#else
- <menu id="helpMenu"
- label="&helpMenu.label;"
- accesskey="&helpMenu.accesskey;">
-#endif
- <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
+<menu id="helpMenu"
+ label="&helpMenu.label;"
+ accesskey="&helpMenu.accesskey;">
+
+ <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
<menuitem id="menu_openHelp"
oncommand="openHelpLink('firefox-help')"
onclick="checkForMiddleClick(this, event);"
label="&productHelp.label;"
accesskey="&productHelp.accesskey;"
-#ifdef XP_MACOSX
- key="key_openHelpMac"/>
-#else
/>
-#endif
- <menuitem id="troubleShooting"
+
+ <menuitem id="troubleShooting"
accesskey="&helpTroubleshootingInfo.accesskey;"
label="&helpTroubleshootingInfo.label;"
oncommand="openTroubleshootingPage()"
@@ -89,22 +62,6 @@
</menu>
<keyset id="baseMenuKeyset">
-#ifdef XP_MACOSX
- <key id="key_openHelpMac"
- oncommand="openHelpLink('firefox-osxkey');"
- key="&helpMac.commandkey;"
- modifiers="accel"/>
-<!-- These are used to build the Application menu under Cocoa widgets -->
- <key id="key_preferencesCmdMac"
- key="&preferencesCmdMac.commandkey;"
- modifiers="accel"/>
- <key id="key_hideThisAppCmdMac"
- key="&hideThisAppCmdMac.commandkey;"
- modifiers="accel"/>
- <key id="key_hideOtherAppsCmdMac"
- key="&hideOtherAppsCmdMac.commandkey;"
- modifiers="accel,alt"/>
-#endif
</keyset>
<stringbundleset id="stringbundleset">