327400 - UI issues with toolbar buttons, paper over potential instabilities in tab switching logic. r=brettw a=dbaron

browser/components/places/content-shim/browserShim.css

@@ -7,6 +7,22 @@ menupopup[type="places"] {
   -moz-binding: url("chrome://browser/content/places/menu.xml#places-menupopup");
 }
 
+/** XXXben this needs to move into skin **/
+
+#places-bookmark {
+  list-style-image: url("chrome://browser/skin/bookmarks/Bookmarks-toolbar.png");
+  -moz-image-region: rect(0px 24px 24px 0px);
+}
+
+#places-subscribe {
+  list-style-image: url("chrome://browser/skin/page-livemarks.png");
+  opacity: 1.0;
+}
+
+#places-subscribe[disabled="true"] {
+  opacity: 0.3;
+}
+
 #places-info-popup {
   position: fixed;
   left: 50px;

browser/components/places/content-shim/browserShim.xul

@@ -42,9 +42,14 @@
              customizable="true"/>
   </toolbox>
 
-  <toolbaritem id="urlbar-container">
-    <button id="places-bookmark" label="&location.status.not_bookmarked;" oncommand="PlacesBrowserShim.onBookmarkButtonClick();" align="start"/>
-    <button id="places-subscribe" label="&feed.subscribe.label;" tooltiptext="&feed.subscribe.tooltip;"/>
-  </toolbaritem>
+  <toolbarpalette id="BrowserToolbarPalette">
+    <toolbarbutton id="places-bookmark" 
+                   label="&location.status.not_bookmarked;" 
+                   tooltiptext="&location.status.bookmark.tooltip;" 
+                   oncommand="PlacesBrowserShim.onBookmarkButtonClick();"/>
+    <toolbarbutton id="places-subscribe" 
+                   label="&feed.subscribe.label;" 
+                   tooltiptext="&feed.subscribe.tooltip;"/>
+  </toolbarpalette>
 </overlay>
 

browser/components/places/content/places.js

@@ -132,6 +132,7 @@ var PlacesUIHook = {
   showPlacesUI: function PP_showPlacesUI() {
     ASSERT(PlacesController, "PlacesController does not exist anymore?!");
 
+/*
     this._tabbrowser.setAttribute("places", "true");
     var statusbar = this._topElement("status-bar");
     statusbar.hidden = true;
@@ -151,11 +152,13 @@ var PlacesUIHook = {
     // Disable the find bar so that we can capture key presses. 
     this._topWindow.gFindEnabled = false;
     this._topWindow.addEventListener("find-activated", this.onFindActivated, false);
+*/    
   },
 
   hidePlacesUI: function PP_hidePlacesUI() {
     ASSERT(PlacesController, "PlacesController does not exist anymore?!");
 
+/*
     this._tabbrowser.removeAttribute("places");
     
     // Approaches that cache the value of the status bar before the Places page
@@ -184,6 +187,7 @@ var PlacesUIHook = {
     // Enable the find bar again
     this._topWindow.gFindEnabled = true;
     this._topWindow.removeEventListener("find-activated", this.onFindActivated, false);
+    */
   },
 };