Bug 1435423 - Fold browser-charsetmenu.inc into browser-menubar.inc;r=mossop
authorBrian Grinstead <bgrinstead@mozilla.com>
Fri, 02 Feb 2018 14:30:40 -0800
changeset 457293 8747c9b1107a3ace2b13a98a2a6cb4d7b0bf5a3f
parent 457292 ab0557eb43153858d233a91c163eec3572f0b1e6
child 457294 f53bac4e3d94b4a954dd3d05b82bb0bb4cba0896
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmossop
bugs1435423
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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"/>