diff options
| author | Gaming4JC <g4jc@bulletmail.org> | 2019-01-02 20:21:44 -0500 |
|---|---|---|
| committer | Gaming4JC <g4jc@bulletmail.org> | 2019-01-02 20:21:44 -0500 |
| commit | ec1a475693dcbe9ceb17a2b709e913e9ef0fed34 (patch) | |
| tree | a56847253620297331d54c0d09ae45c660901383 /base | |
| parent | 451f5abe980ba64920039a756330cc5f0355db7a (diff) | |
| download | iceweasel-uxp-ec1a475693dcbe9ceb17a2b709e913e9ef0fed34.tar.gz | |
backport m-c 1472787: Remove hiddenWindow.xul from non-mac builds
Diffstat (limited to 'base')
| -rw-r--r-- | base/content/hiddenWindow.xul | 3 | ||||
| -rw-r--r-- | base/jar.mn | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/base/content/hiddenWindow.xul b/base/content/hiddenWindow.xul index c708071..553af25 100644 --- a/base/content/hiddenWindow.xul +++ b/base/content/hiddenWindow.xul @@ -5,7 +5,6 @@ # 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 <?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?> <?xml-stylesheet href="chrome://browser/skin/webRTC-indicator.css" type="text/css"?> @@ -16,5 +15,3 @@ #include browserMountPoints.inc </window> - -#endif diff --git a/base/jar.mn b/base/jar.mn index f3ddd9a..46bd118 100644 --- a/base/jar.mn +++ b/base/jar.mn @@ -145,8 +145,10 @@ browser.jar: * content/browser/web-panels.xul (content/web-panels.xul) * content/browser/baseMenuOverlay.xul (content/baseMenuOverlay.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 #ifdef XP_MACOSX * content/browser/macBrowserOverlay.xul (content/macBrowserOverlay.xul) * content/browser/downloadManagerOverlay.xul (content/downloadManagerOverlay.xul) |