Bug 1472787 - Remove hiddenWindow.xul from non-mac builds draft
authorBrian Grinstead <bgrinstead@mozilla.com>
Mon, 02 Jul 2018 13:41:32 -0700
changeset 813249 0a7a4b026c4a8b8483eb82db78c2e44f03341f7f
parent 813062 9c02d2ecf22050bfee5d70c04a359d8aaff6eb91
push id114841
push userbgrinstead@mozilla.com
push dateMon, 02 Jul 2018 20:42:03 +0000
bugs1472787
milestone63.0a1
Bug 1472787 - Remove hiddenWindow.xul from non-mac builds This is never referenced in non-OSX, so don't build the file at all, and remove the preprocessor directive from the file itself. MozReview-Commit-ID: IqhSuZWxbkJ
browser/base/content/hiddenWindow.xul
browser/base/jar.mn
--- a/browser/base/content/hiddenWindow.xul
+++ b/browser/base/content/hiddenWindow.xul
@@ -1,23 +1,20 @@
 <?xml version="1.0"?>
 # -*- Mode: HTML -*-
 #
 # 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/.
 
-#ifdef XP_MACOSX
 <?xml-stylesheet href="chrome://browser/skin/webRTC-indicator.css" type="text/css"?>
 
 <!DOCTYPE window [
 #include browser-doctype.inc
 ]>
 
 <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
 
 </window>
-
-#endif
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -95,18 +95,20 @@ browser.jar:
         content/browser/tabbrowser.css                (content/tabbrowser.css)
         content/browser/tabbrowser.js                 (content/tabbrowser.js)
         content/browser/tabbrowser.xml                (content/tabbrowser.xml)
 *       content/browser/urlbarBindings.xml            (content/urlbarBindings.xml)
         content/browser/utilityOverlay.js             (content/utilityOverlay.js)
         content/browser/webext-panels.js              (content/webext-panels.js)
 *       content/browser/webext-panels.xul             (content/webext-panels.xul)
         content/browser/nsContextMenu.js              (content/nsContextMenu.js)
+#ifdef XP_MACOSX
 # XXX: We should exclude this one as well (bug 71895)
 *       content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)
+#endif
 #ifndef XP_MACOSX
 *       content/browser/webrtcIndicator.xul           (content/webrtcIndicator.xul)
         content/browser/webrtcIndicator.js            (content/webrtcIndicator.js)
 #endif
 # the following files are browser-specific overrides
 *       content/browser/license.html                  (/toolkit/content/license.html)
 % override chrome://global/content/license.html chrome://browser/content/license.html
         content/browser/blockedSite.xhtml               (content/blockedSite.xhtml)