Bug 269410 - Only show the toolbar collapse button in the main browser window and in the Places library window. ui-r=faaborg, r=enndeakin
authorMarkus Stange <mstange@themasta.com>
Thu, 06 Aug 2009 08:51:20 +1200
changeset 31161 33a666c42ee3bb4a9b1594a0e7ae89be893bde7f
parent 31160 c7a96c0ced3673eec246f502e25f503f4e74cfc4
child 31162 35d52ec7e8842b73c72d260e2b6c6fcbbf250d32
push id8401
push usermstange@themasta.com
push dateWed, 05 Aug 2009 21:09:49 +0000
treeherdermozilla-central@35d52ec7e884 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfaaborg, enndeakin
bugs269410
milestone1.9.2a1pre
Bug 269410 - Only show the toolbar collapse button in the main browser window and in the Places library window. ui-r=faaborg, r=enndeakin
browser/base/content/browser.xul
browser/components/places/content/places.xul
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -78,16 +78,17 @@
         titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
         titlemodifier_normal="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
         titlemodifier_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
 #endif
         titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
         windowtype="navigator:browser"
         screenX="4" screenY="4"
         browsingmode="normal"
+        toggletoolbar="true"
         persist="screenX screenY width height sizemode"> 
 
 # 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://browser/content/nsContextMenu.js"/>
 
--- a/browser/components/places/content/places.xul
+++ b/browser/components/places/content/places.xul
@@ -70,16 +70,17 @@
         title="&places.library.title;" 
         windowtype="Places:Organizer" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="PlacesOrganizer.init();"
         onunload="PlacesOrganizer.destroy();"
         width="&places.library.width;" height="&places.library.height;"
         screenX="10" screenY="10"
+        toggletoolbar="true"
         persist="width height screenX screenY sizemode">
 
   <script type="application/x-javascript"
           src="chrome://browser/content/places/places.js"/>
   <script type="application/javascript"
           src="chrome://browser/content/utilityOverlay.js"/>
   <script type="application/javascript"
           src="chrome://browser/content/places/editBookmarkOverlay.js"/>