Rip out the page holder completely.

browser/base/content/browser.xul

@@ -178,10 +178,6 @@
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/history/history-panel.xul"
                  oncommand="toggleSidebar('viewHistorySidebar');"/>
                  
-    <broadcaster id="viewPageHolderSidebar" autoCheck="false" label="&pageHolderButton.label;"
-                 type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/page-drawer.xul"
-                 oncommand="toggleSidebar('viewPageHolderSidebar');"/>
-                 
     <broadcaster id="viewWebPanelsSidebar" autoCheck="false" 
                  type="checkbox" group="sidebar" sidebarurl="chrome://browser/content/web-panels.xul"
                  oncommand="toggleSidebar('viewWebPanelsSidebar');"/>
@@ -254,8 +250,7 @@
     <key id="viewBookmarksSidebarKb" key="&manBookmarksCmd.commandkey;" command="viewBookmarksSidebar" modifiers="accel"/>
     <key id="key_stop" keycode="VK_ESCAPE" command="Browser:Stop"/>
     <key id="key_gotoHistory"  key="&history.commandKey;"  command="viewHistorySidebar" modifiers="accel"/>
-    <key id="key_pageHolderSidebar"  key="&pageHolder.commandKey;"  command="viewPageHolderSidebar" modifiers="accel"/>
-    
+        
     <key id="key_textZoomReduce"  key="&textZoomReduceCmd.commandkey;"   command="cmd_textZoomReduce"  modifiers="accel"/>
     <key id="key_textZoomEnlarge" key="&textZoomEnlargeCmd.commandkey;"  command="cmd_textZoomEnlarge" modifiers="accel"/>
     <key                          key="&textZoomEnlargeCmd.commandkey2;" command="cmd_textZoomEnlarge" modifiers="accel"/>
@@ -664,7 +659,6 @@
                     <menuitem key="key_openDownloadsSidebar" observes="viewDownloadsSidebar"/>
                     <menuitem key="viewBookmarksSidebarKb" observes="viewBookmarksSidebar"/>
                     <menuitem key="key_gotoHistory" observes="viewHistorySidebar"/>
-                    <menuitem key="key_pageHolderSidebar" observes="viewPageHolderSidebar"/>
                   </menupopup>
                 </menu>            
                 <menuseparator/>
@@ -1005,10 +999,6 @@
                        observes="viewBookmarksSidebar"
                        tooltiptext="&bookmarksButton.tooltip;"/>
     
-        <toolbarbutton id="webpanels-button" class="toolbarbutton-1"
-                       observes="viewPageHolderSidebar"
-                       tooltiptext="&pageHolderButton.tooltip;"/>
-                       
         <toolbarbutton id="new-tab-button" class="toolbarbutton-1"
                        label="&tabCmd.label;"
                        command="cmd_newNavigatorTab"

browser/base/jar.mn

@@ -19,9 +19,6 @@ browser.jar:
         content/browser/pageInfo.css                  (content/pageInfo.css)
         content/browser/web-panels.js                 (content/web-panels.js)
         content/browser/web-panels.xul                (content/web-panels.xul)
-	content/browser/page-drawer.xml               (content/page-drawer.xml)
-	content/browser/page-drawer.js                (content/page-drawer.js)
-        content/browser/page-drawer.xul               (content/page-drawer.xul)
         
 classic.jar:
         skin/classic/browser/aboutDialog.css          (skin/aboutDialog.css)
@@ -43,8 +40,6 @@ classic.jar:
         skin/classic/browser/Toolbar.png              (skin/Toolbar.png)
         skin/classic/browser/lock-insecure.gif        (skin/lock-insecure.gif)
         skin/classic/browser/lock-mixed.gif           (skin/lock-mixed.gif)
-	skin/classic/browser/web-panels-drop-page.css         (skin/web-panels-drop-page.css)
-        skin/classic/browser/web-panels-bg.png        (skin/web-panels-bg.png)
 
 en-US.jar:
         locale/en-US/browser/contents.rdf             (locale/contents.rdf)

browser/base/locale/browser.dtd

@@ -104,8 +104,6 @@
 
 <!ENTITY downloadManagerCmd.label     "Download Manager">
 
-<!ENTITY pageHolder.commandKey     "j">
-
 <!ENTITY downloadManagerCmd.accesskey "D">
 
 <!ENTITY javaConsoleCmd.label         "Java Console">
@@ -253,9 +251,6 @@
 <!ENTITY historyButton.label            "History">
 <!ENTITY historyButton.tooltip          "Displays pages you've viewed recently">
 
-<!ENTITY pageHolderButton.label         "Page Holder">
-<!ENTITY pageHolderButton.tooltip       "Displays pages in a sidebar panel">
-
 <!ENTITY newTabButton.tooltip           "Opens a new tab">
 <!ENTITY newWindowButton.tooltip        "Opens a new window">
 

browser/base/skin/browser.css

@@ -302,18 +302,6 @@ toolbar[mode="text"] .toolbarbutton-text {
   -moz-image-region: rect(64px 224px 96px 192px);
 }
 
-/* FIXME: Bogus placeholder (using bookmarks image) until we have an icon in this theme for web panels */
-#webpanels-button {
-  -moz-image-region: rect(0px 256px 32px 224px);
-}
-#webpanels-button:hover,
-#webpanels-button[checked="true"] {
-  -moz-image-region: rect(32px 256px 64px 224px);
-}
-#webpanels-button[disabled="true"] {
-  -moz-image-region: rect(64px 256px 96px 224px);
-}
-
 #cut-button {
   -moz-image-region: rect(0px 384px 32px 352px);
 }
@@ -454,20 +442,6 @@ toolbar[iconsize="small"] #bookmarks-button[disabled="true"] {
   -moz-image-region: rect(40px 160px 60px 140px) !important;
 }
 
-/* FIXME: Bogus placeholder for Web Panels.  Using the small Bookmarks button image
-  until we get an image. */
-toolbar[iconsize="small"] #webpanels-button {
-  -moz-image-region: rect(0px 160px 20px 140px);
-}
-toolbar[iconsize="small"] #webpanels-button:hover,
-toolbar[iconsize="small"] #webpanels-button[checked="true"] {
-  -moz-image-region: rect(20px 160px 40px 140px);
-}
-toolbar[iconsize="small"] #webpanels-button[disabled="true"] {
-  -moz-image-region: rect(40px 160px 60px 140px) !important;
-}
-
-
 toolbar[iconsize="small"] #history-button {
   -moz-image-region: rect(0px 140px 20px 120px);
 }