Bug 1435423 - Fold browser-charsetmenu.inc into browser-menubar.inc;r=mossop draft
authorBrian Grinstead <bgrinstead@mozilla.com>
Fri, 02 Feb 2018 14:30:40 -0800
changeset 750818 7ecd223db94f8eba3a1f682d964effae6331317d
parent 750719 2638ae89f86fbb5f224ef0511b3f77aec5503a51
push id97758
push userbgrinstead@mozilla.com
push dateFri, 02 Feb 2018 22:31:21 +0000
reviewersmossop
bugs1435423
milestone60.0a1
Bug 1435423 - Fold browser-charsetmenu.inc into browser-menubar.inc;r=mossop MozReview-Commit-ID: 3KCyTDE9BRX
browser/base/content/browser-charsetmenu.inc
browser/base/content/browser-menubar.inc
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"/>