Bug 867368 - Remove Bookmarks sidebar control as a toolbar customization item. r=jaws.

browser/base/content/browser.js

@@ -2773,35 +2773,6 @@ function openHomeDialog(aURL)
   }
 }
 
-var bookmarksButtonObserver = {
-  onDrop: function (aEvent)
-  {
-    let name = { };
-    let url = browserDragAndDrop.drop(aEvent, name);
-    try {
-      PlacesUIUtils.showBookmarkDialog({ action: "add"
-                                       , type: "bookmark"
-                                       , uri: makeURI(url)
-                                       , title: name
-                                       , hiddenRows: [ "description"
-                                                     , "location"
-                                                     , "loadInSidebar"
-                                                     , "keyword" ]
-                                       }, window);
-    } catch(ex) { }
-  },
-
-  onDragOver: function (aEvent)
-  {
-    browserDragAndDrop.dragOver(aEvent);
-    aEvent.dropEffect = "link";
-  },
-
-  onDragExit: function (aEvent)
-  {
-  }
-}
-
 var newTabButtonObserver = {
   onDragOver: function (aEvent)
   {

browser/base/content/browser.xul

@@ -990,14 +990,6 @@
                      observes="viewHistorySidebar" label="&historyButton.label;"
                      tooltiptext="&historyButton.tooltip;"/>
 
-      <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                     observes="viewBookmarksSidebar"
-                     tooltiptext="&bookmarksButton.tooltip;"
-                     ondrop="bookmarksButtonObserver.onDrop(event)"
-                     ondragover="bookmarksButtonObserver.onDragOver(event)"
-                     ondragenter="bookmarksButtonObserver.onDragOver(event)"
-                     ondragexit="bookmarksButtonObserver.onDragExit(event)"/>
-
       <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      label="&newNavigatorCmd.label;"
                      command="key_newNavigator"

browser/locales/en-US/chrome/browser/browser.dtd

@@ -171,7 +171,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY feedButton.tooltip           "Subscribe to this page…">
 
 <!ENTITY bookmarksButton.label          "Bookmarks">
-<!ENTITY bookmarksButton.tooltip        "Display your bookmarks">
 <!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksMenuButton.label          "Bookmarks">

browser/themes/linux/browser.css

@@ -657,7 +657,6 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0px 48px 24px 24px);
 }
 
-#bookmarks-button,
 #bookmarks-menu-button {
   -moz-image-region: rect(0px 72px 24px 48px);
 }
@@ -690,15 +689,10 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
  * !important.
  *
  * Here are the relevant removal bugs:
- * #bookmarks-button - Bug 867368
  * #cut-button, #copy-button, #paste-button - Bug 870901
  * #zoom-out-button, #zoom-in-button - Bug 870897
  */
 
-#bookmarks-button {
-  list-style-image: url("chrome://browser/skin/Toolbar.png") !important;
-}
-
 #cut-button {
   list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar") !important;
 }
@@ -837,7 +831,6 @@ toolbar[iconsize="small"] #history-button {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-toolbar[iconsize="small"] #bookmarks-button,
 toolbar[iconsize="small"] #bookmarks-menu-button,
 #bookmarks-menu-button.bookmark-item {
   -moz-image-region: rect(0px 48px 16px 32px);

browser/themes/osx/browser.css

@@ -898,30 +898,20 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
 
 /* bookmark sidebar & menu buttons */
 
-#bookmarks-button,
 #bookmarks-menu-button {
   -moz-image-region: rect(0, 180px, 20px, 160px);
 }
 
-#bookmarks-button[checked="true"] {
-  -moz-image-region: rect(20px, 180px, 40px, 160px);
-}
-
 #bookmarks-menu-button.bookmark-item {
   -moz-image-region: rect(2px, 178px, 18px, 162px);
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
 @media (min-resolution: 2dppx) {
-  #bookmarks-button,
   #bookmarks-menu-button {
     -moz-image-region: rect(0, 360px, 40px, 320px);
   }
 
-  #bookmarks-button[checked="true"] {
-    -moz-image-region: rect(40px, 360px, 80px, 320px);
-  }
-
   #bookmarks-menu-button.bookmark-item {
     -moz-image-region: rect(4px, 356px, 36px, 324px);
     list-style-image: url("chrome://browser/skin/Toolbar@2x.png");

browser/themes/shared/browser.inc

@@ -1,3 +1,3 @@
 %filter substitution
 
-%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #bookmarks-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button
+%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #history-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button

browser/themes/windows/browser.css

@@ -694,7 +694,6 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
-#bookmarks-button,
 #bookmarks-menu-button {
   -moz-image-region: rect(0, 144px, 18px, 126px);
 }