From 99ebf6581c27e2da587ed642a3eba071e9875ff0 Mon Sep 17 00:00:00 2001
From: "mozilla.mano%sent.com"
 <mozilla.mano%sent.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 20 Apr 2005 15:32:57 +0000
Subject: [PATCH] Bug 239218 - [Mac] Menus are nonfunctional in the
 Extensions/themes manager and in the JS Console. r=mconnor a=asa

git-svn-id: svn://10.0.0.236/trunk@172489 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser.xul      |  9 ++--
 mozilla/browser/base/content/contents.rdf     | 15 ++++++
 .../base/content/extensionsManagerOverlay.xul | 50 +++++++++++++++++++
 ...browser-scripts.inc => global-scripts.inc} |  1 -
 .../browser/base/content/jsConsoleOverlay.xul | 50 +++++++++++++++++++
 .../base/content/macBrowserOverlay.xul        |  7 +--
 mozilla/browser/base/jar.mn                   |  4 +-
 7 files changed, 128 insertions(+), 8 deletions(-)
 create mode 100644 mozilla/browser/base/content/extensionsManagerOverlay.xul
 rename mozilla/browser/base/content/{browser-scripts.inc => global-scripts.inc} (96%)
 create mode 100644 mozilla/browser/base/content/jsConsoleOverlay.xul

diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index b99c406980c..2600c192efc 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -65,9 +65,12 @@
         screenX="4" screenY="4"
         persist="screenX screenY width height sizemode"> 
 
-# All JS files that browser.xul wishes to include *must* go into the browser-scripts.inc file
-# so that they can be shared by hiddenWindow.xul.
-#include browser-scripts.inc
+# All JS files which are not content (only) dependent that browser.xul
+# wishes to include *must* go into the global-scripts.inc file
+# so that they can be shared by macBrowserOverlay.xul.
+#include global-scripts.inc
+
+<script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
 # All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the 
 # browser-sets.inc file for sharing with hiddenWindow.xul.
diff --git a/mozilla/browser/base/content/contents.rdf b/mozilla/browser/base/content/contents.rdf
index a14cba02e18..2f286235573 100644
--- a/mozilla/browser/base/content/contents.rdf
+++ b/mozilla/browser/base/content/contents.rdf
@@ -20,11 +20,26 @@
 #ifdef XP_MACOSX
   <RDF:Seq RDF:about="urn:mozilla:overlays">
       <RDF:li RDF:resource="chrome://mozapps/content/downloads/downloads.xul"/>
+      <RDF:li RDF:resource="chrome://mozapps/content/extensions/extensions.xul?type=extensions"/>
+      <RDF:li RDF:resource="chrome://mozapps/content/extensions/extensions.xul?type=themes"/>
+      <RDF:li RDF:resource="chrome://global/content/console.xul"/>
   </RDF:Seq>
 
   <RDF:Seq RDF:about="chrome://mozapps/content/downloads/downloads.xul">
       <RDF:li>chrome://browser/content/downloadManagerOverlay.xul</RDF:li>
   </RDF:Seq>
+
+  <RDF:Seq RDF:about="chrome://mozapps/content/extensions/extensions.xul?type=extensions">
+      <RDF:li>chrome://browser/content/extensionsManagerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq RDF:about="chrome://mozapps/content/extensions/extensions.xul?type=themes">
+      <RDF:li>chrome://browser/content/extensionsManagerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq RDF:about="chrome://global/content/console.xul">
+      <RDF:li>chrome://browser/content/jsConsoleOverlay.xul</RDF:li>
+  </RDF:Seq>
 #endif
 </RDF:RDF>
 
diff --git a/mozilla/browser/base/content/extensionsManagerOverlay.xul b/mozilla/browser/base/content/extensionsManagerOverlay.xul
new file mode 100644
index 00000000000..fae3991c156
--- /dev/null
+++ b/mozilla/browser/base/content/extensionsManagerOverlay.xul
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.org code.
+#
+# The Initial Developer of the Original Code is Asaf Romano
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Asaf Romano <mozilla.mano@sent.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+<overlay id="extensionsManagerOverlay"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
+
+<window id="extensionsManager">
+
+#include browserMountPoints.inc
+
+</window>
+
+</overlay>
diff --git a/mozilla/browser/base/content/browser-scripts.inc b/mozilla/browser/base/content/global-scripts.inc
similarity index 96%
rename from mozilla/browser/base/content/browser-scripts.inc
rename to mozilla/browser/base/content/global-scripts.inc
index 182d9992d6b..532a8f345e4 100644
--- a/mozilla/browser/base/content/browser-scripts.inc
+++ b/mozilla/browser/base/content/global-scripts.inc
@@ -45,7 +45,6 @@
 <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
 <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksMenu.js"/>
 <script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
-<script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
 <script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
 <script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
 <script type="application/x-javascript" src="chrome://browser/content/sanitize.js"/>
diff --git a/mozilla/browser/base/content/jsConsoleOverlay.xul b/mozilla/browser/base/content/jsConsoleOverlay.xul
new file mode 100644
index 00000000000..c732269f1b9
--- /dev/null
+++ b/mozilla/browser/base/content/jsConsoleOverlay.xul
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.org code.
+#
+# The Initial Developer of the Original Code is Asaf Romano
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Asaf Romano <mozilla.mano@sent.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+<overlay id="jsConsoleOverlay"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
+
+<window id="JSConsoleWindow">
+
+#include browserMountPoints.inc
+
+</window>
+
+</overlay>
diff --git a/mozilla/browser/base/content/macBrowserOverlay.xul b/mozilla/browser/base/content/macBrowserOverlay.xul
index 20e6789f6a2..1f2d55f483c 100644
--- a/mozilla/browser/base/content/macBrowserOverlay.xul
+++ b/mozilla/browser/base/content/macBrowserOverlay.xul
@@ -50,9 +50,10 @@
 
 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
 
-# All JS files that browser.xul wishes to include *must* go into the browser-scripts.inc file
-# so that they can be shared by hiddenWindow.xul.
-#include browser-scripts.inc
+# All JS files which are not content (only) dependent that browser.xul
+# wishes to include *must* go into the global-scripts.inc file
+# so that they can be shared by this overlay.
+#include global-scripts.inc
 
 <script type="application/x-javascript">
   addEventListener("load", nonBrowserWindowStartup, false);
diff --git a/mozilla/browser/base/jar.mn b/mozilla/browser/base/jar.mn
index 668d0274b27..f8f38d9e60d 100644
--- a/mozilla/browser/base/jar.mn
+++ b/mozilla/browser/base/jar.mn
@@ -1,5 +1,5 @@
 browser.jar:
-        content/browser/contents.rdf                  (content/contents.rdf)
+*       content/browser/contents.rdf                  (content/contents.rdf)
         content/browser-region/contents.rdf           (content/contents-region.rdf)
 *       content/browser/aboutDialog.xul               (content/aboutDialog.xul)
 *       content/browser/aboutDialog.js                (content/aboutDialog.js)
@@ -32,6 +32,8 @@ browser.jar:
 #ifdef XP_MACOSX
 *       content/browser/macBrowserOverlay.xul         (content/macBrowserOverlay.xul)
 *       content/browser/downloadManagerOverlay.xul    (content/downloadManagerOverlay.xul)
+*       content/browser/extensionsManagerOverlay.xul  (content/extensionsManagerOverlay.xul)
+*       content/browser/jsConsoleOverlay.xul          (content/jsConsoleOverlay.xul)
 #endif
 #ifndef MOZ_USE_OFFICIAL_BRANDING
   content/branding/contents.rdf                  (branding/contents.rdf)