Bug 371439 - Some old history & bookmarks frontend code is still built for places/places-bookmarks builds. r=gavin.
authormozilla.mano@sent.com
Thu, 22 Mar 2007 17:00:34 -0700
changeset 15 19ec9df681b22c7a480368b6fd78f105f9413db7
parent 14 c440979aa01fcb48ded6b6c9d6df8586a15034c6
child 16 f880729f348708feb6f1788ec14d53d07dc2b829
push idunknown
push userunknown
push dateunknown
reviewersgavin
bugs371439
milestone1.9a3pre
Bug 371439 - Some old history & bookmarks frontend code is still built for places/places-bookmarks builds. r=gavin.
browser/base/content/browser-sets.inc
browser/base/content/browser.xul
browser/base/content/macBrowserOverlay.xul
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -47,30 +47,32 @@
   <stringbundleset id="stringbundleset"> 
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_shell" src="chrome://browser/locale/shellservice.properties"/>
     <stringbundle id="bundle_preferences" src="chrome://browser/locale/preferences/preferences.properties"/>
   </stringbundleset>
 
   <commandset id="mainCommandSet">
     <command id="cmd_newNavigator"                 oncommand="OpenBrowserWindow()"/>
+#ifndef MOZ_PLACES_BOOKMARKS
     <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
     <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
     <command id="cmd_bm_openinnewtab"              oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
     <command id="cmd_bm_openfolder"                oncommand="goDoCommand('cmd_bm_openfolder');"/>
     <command id="cmd_bm_managefolder"              oncommand="goDoCommand('cmd_bm_managefolder');"/>
     <command id="cmd_bm_newfolder"                 oncommand="goDoCommand('cmd_bm_newfolder');"/>
     <command id="cmd_bm_newbookmark"               oncommand="goDoCommand('cmd_bm_newbookmark');"/>
     <command id="cmd_bm_newseparator"              oncommand="goDoCommand('cmd_bm_newseparator');"/>
     <command id="cmd_bm_properties"                oncommand="goDoCommand('cmd_bm_properties');"/>
     <command id="cmd_bm_refreshlivemark"           oncommand="goDoCommand('cmd_bm_refreshlivemark');"/>
     <command id="cmd_bm_refreshmicrosummary"       oncommand="goDoCommand('cmd_bm_refreshmicrosummary');"/>
     <command id="cmd_bm_rename"                    oncommand="goDoCommand('cmd_bm_rename');"/>
     <command id="cmd_bm_moveBookmark"              oncommand="goDoCommand('cmd_bm_moveBookmark');"/>
     <command id="cmd_bm_sortbyname"                oncommand="goDoCommand('cmd_bm_sortbyname');"/>
+#endif
 
     <command id="cmd_handleBackspace" oncommand="BrowserHandleBackspace();" />
     <command id="cmd_handleShiftBackspace" oncommand="BrowserHandleShiftBackspace();" />
 
     <command id="cmd_newNavigatorTab" oncommand="BrowserOpenTab();"/>
     <command id="Browser:OpenFile"  oncommand="BrowserOpenFileWindow();"/>
     <command id="Browser:SavePage" oncommand="saveDocument(window.content.document);"/>
     <command id="Browser:SaveFrame" oncommand="saveFrameDocument();"/>
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -129,18 +129,20 @@
            onpopupshowing="if (event.target != this) return true; gContextMenu = new nsContextMenu(this, window.getBrowser()); return gContextMenu.shouldDisplay;"
            onpopuphiding="if (event.target == this) { gContextMenu = null; }">
 #include browser-context.inc
     </popup>
 
     <popup id="placesContext"/>
   </popupset>
 
+#ifndef MOZ_PLACES
 # The hacky hidden tree used by the Go menu to build items.
 #include browser-gotreehack.inc
+#endif
 
 #ifndef MOZ_PLACES_BOOKMARKS
   <!-- bookmarks context menu -->
   <popupset>
     <menupopup id="bookmarks-context-menu" 
                onpopupshowing="return BookmarksMenu.createContextMenu(event);"
                onpopuphidden ="BookmarksMenu.destroyContextMenu(event);"/>
   </popupset>
--- a/browser/base/content/macBrowserOverlay.xul
+++ b/browser/base/content/macBrowserOverlay.xul
@@ -67,16 +67,18 @@
 <script type="application/x-javascript">
   addEventListener("load", nonBrowserWindowStartup, false);
 </script>
 
 # All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the 
 # browser-sets.inc file for sharing with hiddenWindow.xul.
 #include browser-sets.inc
 
+#ifndef MOZ_PLACES
 # The hacky hidden tree used by the Go menu to build items.
 #include browser-gotreehack.inc
+#endif
 
 # The entire main menubar is placed into browser-menubar.inc, so that it can be shared by 
 # hiddenWindow.xul.
 #include browser-menubar.inc
 
 </overlay>