Bug 682723 - Move common overlay/scripts from hiddenWindow/navigator to navigatorOverlay r=mnyromyr
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 12 Sep 2011 15:57:33 +0100
changeset 9160 61388be25d31611521b80bcbefea5012288d9ee0
parent 9159 237c4a4a748d2e12a1a40d5b27e35e4c67f70de8
child 9161 034a8229391f922ec8ea937908f7b56172af91ce
push id230
push userbugzilla@standard8.plus.com
push dateTue, 08 Nov 2011 22:55:24 +0000
treeherdercomm-beta@63dad5648415 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmnyromyr
bugs682723
Bug 682723 - Move common overlay/scripts from hiddenWindow/navigator to navigatorOverlay r=mnyromyr
suite/browser/hiddenWindow.xul
suite/browser/navigator.xul
suite/browser/navigatorOverlay.xul
--- a/suite/browser/hiddenWindow.xul
+++ b/suite/browser/hiddenWindow.xul
@@ -33,17 +33,16 @@
  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 ***** -->
 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/bookmarks/placesOverlay.xul"?>
 
 <!-- hiddenwindow is a "minimal" XUL window intended for creating the,
      er, hidden window.  This window is never shown, but on platforms
      which leave the app running after the last (visible) window is shut
      down, this window does hold a browser menubar.
        Though this window looks a lot like navigator.xul, that xul
      is unsuitable because it's subject to the whims of its associated
      appcore, which among other things causes it to load content documents
@@ -63,24 +62,16 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   title="hidden"
   titlemodifier="&mainWindow.titlemodifier;" 
   titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
   onload="hiddenWindowStartup();"
   onunload="Shutdown();">
 
-  <!-- JS from navigator.xul, to handle the menu commands -->
-  <script type="application/javascript" src="chrome://navigator/content/browser.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/navigator.js"/>
-
-  <!-- Places Bookmarks Utilities -->
-  <script type="application/javascript" src="chrome://communicator/content/places/browserPlacesViews.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/bookmarks/browser-places.js"/>
-
   <stringbundleset id="stringbundleset"/>
 
   <!-- keys are appended from the overlay -->
   <keyset id="navKeys"/>
 
   <!-- commands are appended from the overlay -->
   <commandset id="commands"/>
 
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -41,17 +41,16 @@
 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/content/places/places.css" type="text/css"?>
 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/linkToolbarOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/bookmarks/placesOverlay.xul"?>
 
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
 %navigatorDTD;
 ]>
@@ -81,24 +80,20 @@
   <script type="application/javascript" src="chrome://navigator/content/nsBrowserStatusHandler.js"/>
   <script type="application/javascript" src="chrome://navigator/content/nsBrowserContentListener.js"/>
   <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
   <script type="application/javascript" src="chrome://communicator/content/findUtils.js"/>
   <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
 
   <!-- Navigator -->
   <script type="application/javascript" src="chrome://navigator/content/fullScreen.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/browser.js"/>
-  <script type="application/javascript" src="chrome://navigator/content/navigator.js"/>
   <script type="application/javascript" src="chrome://navigator/content/navigatorDD.js"/>
   <script type="application/javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
 
   <!-- Places Bookmarks Utilities -->
-  <script type="application/javascript" src="chrome://communicator/content/places/browserPlacesViews.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/bookmarks/browser-places.js"/>
   <script type="application/javascript" src="chrome://communicator/content/bookmarks/editBookmarkOverlay.js"/>
 
   <!-- hook for stringbundle overlays -->
   <stringbundleset id="stringbundleset">
     <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
   </stringbundleset>
 
   <commandset id="commands">
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -40,16 +40,17 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/viewZoomOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/bookmarks/placesOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/mailNavigatorOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/platformNavigationBindings.xul"?>
 
 <!DOCTYPE overlay [
 <!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
 %navigatorDTD;
 <!ENTITY % navigatorOverlayDTD SYSTEM "chrome://navigator/locale/navigatorOverlay.dtd">
@@ -57,16 +58,28 @@
 <!ENTITY % contentAreaCommandsDTD SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
 %contentAreaCommandsDTD;
 ]>
 
 <overlay id="navigatorOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+  <!-- Navigator -->
+  <script type="application/javascript"
+          src="chrome://navigator/content/browser.js"/>
+  <script type="application/javascript"
+          src="chrome://navigator/content/navigator.js"/>
+
+  <!-- Places Bookmarks Utilities -->
+  <script type="application/javascript"
+          src="chrome://communicator/content/places/browserPlacesViews.js"/>
+  <script type="application/javascript"
+          src="chrome://communicator/content/bookmarks/browser-places.js"/>
+
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_navigator"
                   src="chrome://navigator/locale/navigator.properties"/>
     <stringbundle id="bundle_brand"
                   src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_navigator_region"
                   src="chrome://navigator-region/locale/region.properties"/>
     <stringbundle id="bundle_viewZoom"/>