bug 586363 - Bookmark Manager doesn't open if all windows are closed (on Mac), r=stefanh
authorRobert Kaiser <kairo@kairo.at>
Sat, 04 Sep 2010 15:09:12 +0200
changeset 6314 e2155ffb330a1fa1567c01d22da33c6fe52bc5d8
parent 6313 10733fbe5be98940a526a1875348f60700108828
child 6315 87014e0c1dcbfd8bb0f9440d596835cf88310359
push idunknown
push userunknown
push dateunknown
bug 586363 - Bookmark Manager doesn't open if all windows are closed (on Mac), r=stefanh
--- a/suite/browser/hiddenWindow.xul
+++ b/suite/browser/hiddenWindow.xul
@@ -33,16 +33,17 @@
  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
@@ -66,18 +67,19 @@
   <!-- 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"/>
-  <!-- Shared Bookmarks Utility Library -->
-  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarks.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"/>
   <!-- keys are appended from the overlay -->
@@ -89,22 +91,21 @@
   <!-- commands are appended from the overlay -->
   <commandset id="commands">
     <commandset id="tasksCommands"/>
     <commandset id="globalEditMenuItems"/>
     <commandset id="selectEditMenuItems"/>
     <commandset id="undoEditMenuItems"/>
     <commandset id="clipboardEditMenuItems"/>
+    <commandset id="placesCommands"/>
   <broadcasterset id="navBroadcasters"/>
-  <template id="bookmarksMenuTemplate"/>
   <!-- it's the whole navigator.xul menubar! hidden windows need to
        have a menubar for situations where they're the only window remaining
        on a platform that wants to leave the app running, like the Mac.
   <toolbox id="toolbox">
     <menubar id="main-menubar" position="1"/>