Bug 1435423 - Fold browser-charsetmenu.inc into browser-menubar.inc;r=mossop
MozReview-Commit-ID: 3KCyTDE9BRX
deleted file mode 100644
--- a/browser/base/content/browser-charsetmenu.inc
+++ /dev/null
@@ -1,12 +0,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/.
-
-<menu id="charsetMenu"
- label="&charsetMenu2.label;"
- accesskey="&charsetMenu2.accesskey;"
- oncommand="BrowserSetForcedCharacterSet(event.target.getAttribute('charset'));"
- onpopupshowing="CharsetMenu.build(event.target); UpdateCurrentCharset(this);">
- <menupopup>
- </menupopup>
-</menu>
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -258,17 +258,24 @@
label="&pageStylePersistentOnly.label;"
accesskey="&pageStylePersistentOnly.accesskey;"
oncommand="gPageStyleMenu.switchStyleSheet('');"
type="radio"
checked="true"/>
<menuseparator/>
</menupopup>
</menu>
-#include browser-charsetmenu.inc
+ <menu id="charsetMenu"
+ label="&charsetMenu2.label;"
+ accesskey="&charsetMenu2.accesskey;"
+ oncommand="BrowserSetForcedCharacterSet(event.target.getAttribute('charset'));"
+ onpopupshowing="CharsetMenu.build(event.target); UpdateCurrentCharset(this);">
+ <menupopup>
+ </menupopup>
+ </menu>
<menuseparator/>
#ifdef XP_MACOSX
<menuitem id="enterFullScreenItem"
accesskey="&enterFullScreenCmd.accesskey;"
label="&enterFullScreenCmd.label;"
key="key_fullScreen">
<observes element="View:FullScreen" attribute="oncommand"/>
<observes element="View:FullScreen" attribute="disabled"/>