Bug 1471734 - Move OSX dock menu markup to hiddenWindow.xul;r=Gijs draft
authorBrian Grinstead <bgrinstead@mozilla.com>
Mon, 02 Jul 2018 10:42:25 -0700
changeset 813164 8a1b0caa9aa841b31c38111575287b4a8a3fd79b
parent 813062 9c02d2ecf22050bfee5d70c04a359d8aaff6eb91
child 813165 f463e41602b6c34c4cfcc2254d78647724117318
push id114811
push userbgrinstead@mozilla.com
push dateMon, 02 Jul 2018 17:43:00 +0000
reviewersGijs
bugs1471734
milestone63.0a1
Bug 1471734 - Move OSX dock menu markup to hiddenWindow.xul;r=Gijs It's currently in macWindow.inc.xul which means it gets created for all non-browser windows, but it's only ever set up for the hidden window. MozReview-Commit-ID: LeXjKihPRYB
browser/base/content/hiddenWindow.xul
browser/base/content/macWindow.inc.xul
--- a/browser/base/content/hiddenWindow.xul
+++ b/browser/base/content/hiddenWindow.xul
@@ -13,11 +13,23 @@
 ]>
 
 <window id="main-window"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 #include macWindow.inc.xul
 
+<!-- Dock menu -->
+<popupset>
+  <menupopup id="menu_mac_dockmenu">
+    <!-- The command cannot be cmd_newNavigator because we need to activate
+         the application. -->
+    <menuitem label="&newNavigatorCmd.label;" oncommand="OpenBrowserWindowFromDockMenu();"
+              id="macDockMenuNewWindow" />
+    <menuitem label="&newPrivateWindow.label;" oncommand="OpenBrowserWindowFromDockMenu({private: true});"
+              id="macDockMenuNewPrivateWindow" />
+  </menupopup>
+</popupset>
+
 </window>
 
 #endif
--- a/browser/base/content/macWindow.inc.xul
+++ b/browser/base/content/macWindow.inc.xul
@@ -51,20 +51,8 @@
 # All sets except for popupsets (commands, keys, stringbundles and broadcasters)
 # *must* go into the browser-sets.inc file so that they can be shared with
 # browser.xul
 #include browser-sets.inc
 
 # The entire main menubar is placed into browser-menubar.inc, so that it can be
 # shared with browser.xul.
 #include browser-menubar.inc
-
-<!-- Dock menu -->
-<popupset>
-  <menupopup id="menu_mac_dockmenu">
-    <!-- The command cannot be cmd_newNavigator because we need to activate
-         the application. -->
-    <menuitem label="&newNavigatorCmd.label;" oncommand="OpenBrowserWindowFromDockMenu();"
-              id="macDockMenuNewWindow" />
-    <menuitem label="&newPrivateWindow.label;" oncommand="OpenBrowserWindowFromDockMenu({private: true});"
-              id="macDockMenuNewPrivateWindow" />
-  </menupopup>
-</popupset>