From a793e2f4c955f517f3d4a64aba2f0885d8d332c5 Mon Sep 17 00:00:00 2001
From: "hyatt%mozilla.org"
 <hyatt%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 11 Aug 2003 08:03:52 +0000
Subject: [PATCH] Separate scripts into their own .inc file so they can be
 shared with the hiddenWindow.

git-svn-id: svn://10.0.0.236/trunk@145857 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/base/content/browser-doctype.inc  | 11 ++++++++
 .../browser/base/content/browser-scripts.inc  | 10 ++++++++
 mozilla/browser/base/content/browser.xul      | 25 +++++--------------
 3 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 mozilla/browser/base/content/browser-doctype.inc
 create mode 100644 mozilla/browser/base/content/browser-scripts.inc

diff --git a/mozilla/browser/base/content/browser-doctype.inc b/mozilla/browser/base/content/browser-doctype.inc
new file mode 100644
index 00000000000..a8d589cd9e8
--- /dev/null
+++ b/mozilla/browser/base/content/browser-doctype.inc
@@ -0,0 +1,11 @@
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
+%browserDTD;
+<!ENTITY % globalRegionDTD SYSTEM "chrome://global-region/locale/region.dtd">
+%globalRegionDTD;
+<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charset.dtd" >
+%charsetDTD;
+]>
+
diff --git a/mozilla/browser/base/content/browser-scripts.inc b/mozilla/browser/base/content/browser-scripts.inc
new file mode 100644
index 00000000000..fd7d05fa676
--- /dev/null
+++ b/mozilla/browser/base/content/browser-scripts.inc
@@ -0,0 +1,10 @@
+<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+<script type="application/x-javascript" src="chrome://global/content/findUtils.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
+<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://browser/content/contentAreaUtils.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
+
diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index 25f6c92b8c9..33033a29c79 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -29,16 +29,9 @@
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
 
-<!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
-%browserDTD;
-<!ENTITY % globalRegionDTD SYSTEM "chrome://global-region/locale/region.dtd">
-%globalRegionDTD;
-<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charset.dtd" >
-%charsetDTD;
-]>
+# All DTD information is stored in a separate file so that it can be shared by
+# hiddenWindow.xul.
+#include content/browser-doctype.inc
 
 <window id="main-window"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -52,15 +45,9 @@
         screenX="4" screenY="4"
         persist="screenX screenY width height sizemode"> 
 
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/findUtils.js"/>
-  <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
-  <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://browser/content/contentAreaUtils.js"/>
-  <script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
+# 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 content/browser-scripts.inc
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>