Bug 369785 - Accel+B should open the bookmarks sidebar (places-bookmarks builds). r=sspitzer.

browser/base/content/browser-menubar.inc

@@ -353,14 +353,6 @@
                 <menuitem label="&historyHomeCmd.label;"
                           command="Browser:Home"
                           key="historyHome"/>
-#ifdef MOZ_PLACES_NEW_HISTORY_UI
-                <menuseparator/>
-                <menuitem label="&historySearchCmd.label;"
-                          command="Browser:SearchHistory"
-                          key="searchHistoryKb"/>
-                <menuitem label="&historyShowCmd.label;"
-                          command="Browser:ShowHistory"/>
-#endif
                 <menuseparator id="startTabHistorySeparator"/>
                 <menuseparator hidden="true" id="endTabHistorySeparator"/>
                 <menu id="historyUndoMenu" label="&historyUndoMenu.label;" disabled="true">
@@ -490,8 +482,6 @@
       </menu>
       <menuitem label="&addCurPagesCmd.label;" 
                 command="Browser:BookmarkAllTabs" key="bookmarkAllTabsKb"/>
-      <menuitem label="&searchBookmarksCmd.label;" 
-                command="Browser:ShowBookmarks" key="searchBookmarksKb"/>
       <menuitem label="&manBookmarksCmd.label;" 
                 command="Browser:ShowBookmarks" key="manBookmarkKb"/>
       <menuseparator builder="start"/>

browser/base/content/browser-sets.inc

@@ -186,10 +186,6 @@
 #endif
 
   <broadcasterset id="mainBroadcasterSet">
-#ifdef MOZ_PLACES_NEW_HISTORY_UI
-    <broadcaster id="viewHistoryPlaces" autoCheck="false" label="&historyButton.label;"
-                 oncommand="PlacesCommandHook.showPlacesPopup(event);"/>
-#else
     <broadcaster id="viewBookmarksSidebar" autoCheck="false" label="&bookmarksButton.label;"
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/bookmarks/bookmarksPanel.xul"
                  oncommand="toggleSidebar('viewBookmarksSidebar');"/>
@@ -205,7 +201,6 @@
     <broadcaster id="viewWebPanelsSidebar" autoCheck="false" 
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/web-panels.xul"
                  oncommand="toggleSidebar('viewWebPanelsSidebar');"/>
-#endif
 
     <!-- popup blocking menu items -->
     <broadcaster id="blockedPopupAllowSite" 
@@ -329,11 +324,7 @@
 #ifndef MOZ_WIDGET_GTK2
     <key id="bookmarkAllTabsKb" key="&addCurPageAsCmd.commandkey;" command="Browser:BookmarkAllTabs" modifiers="accel,shift"/>
 #endif
-#ifdef MOZ_PLACES_BOOKMARKS
-    <key id="searchBookmarksKb" key="&searchBookmarksCmd.commandkey;" command="Browser:ShowBookmarks" modifiers="accel"/>
-#else
     <key id="viewBookmarksSidebarKb" key="&bookmarksSidebarCmd.commandkey;" command="viewBookmarksSidebar" modifiers="accel"/>
-#endif
 #ifdef XP_WIN
 # Cmd+I is conventially mapped to Info on MacOS X, thus it should not be 
 # overridden for other purposes there. 
@@ -348,16 +339,6 @@
     <key id="key_stop_mac" modifiers="accel" key="&stopCmd.macCommandKey;" oncommand="BrowserStop();"/>
 #endif
 
-#ifdef MOZ_PLACES_NEW_HISTORY_UI
-    <key id="searchHistoryKb"
-         key="&historySidebarCmd.commandKey;"
-#ifdef XP_MACOSX
-         modifiers="accel,shift"
-#else
-         modifiers="accel"
-#endif
-         command="viewHistoryPlaces"/>
-#else
     <key id="key_gotoHistory"
          key="&historySidebarCmd.commandKey;"
 #ifdef XP_MACOSX
@@ -366,7 +347,6 @@
          modifiers="accel"
 #endif
          command="viewHistorySidebar"/>
-#endif
 
     <key id="key_textZoomReduce"  key="&textZoomReduceCmd.commandkey;"   command="cmd_textZoomReduce"  modifiers="accel"/>
     <key id="key_textZoomEnlarge" key="&textZoomEnlargeCmd.commandkey;"  command="cmd_textZoomEnlarge" modifiers="accel"/>

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

@@ -67,9 +67,6 @@
 <!ENTITY manBookmarksCmd.label "Organize Bookmarks...">
 <!ENTITY manBookmarksCmd.accesskey "M">
 <!ENTITY bookmarkAllCmd.label "Bookmark All Tabs...">
-<!ENTITY searchBookmarksCmd.label "Search in Bookmarks...">
-<!ENTITY searchBookmarksCmd.accesskey "S">
-<!ENTITY searchBookmarksCmd.commandkey "B">
 
 <!ENTITY backCmd.label                "Back">
 <!ENTITY backCmd.accesskey            "B">