Backing out patch for bug 24651 until we can make initial button state honor preferences. a=tor

modules/libpref/src/init/all.js

@@ -105,7 +105,6 @@ pref("browser.chrome.toolbar_tips",         true);
 pref("browser.chrome.toolbar_style",        2);
 
 pref("browser.toolbars.showbutton.bookmarks", true);
-pref("browser.toolbars.showbutton.clear",   false);
 pref("browser.toolbars.showbutton.go",      false);
 pref("browser.toolbars.showbutton.home",    true);
 pref("browser.toolbars.showbutton.mynetscape", true);

modules/libpref/src/unix/unix.js

@@ -69,9 +69,6 @@ pref("clipboard.autocopy", true);
 
 pref("browser.urlbar.clickSelectsAll", false);
 
-// clearbutton default on
-pref("browser.toolbars.showbutton.clear", true);
-
 // override double-click word selection behavior.
 pref("layout.word_select.stop_at_punctuation", false);
 

themes/classic/navigator/navigator.css

@@ -130,10 +130,6 @@
   -moz-image-region: rect(0px 92px 21px 69px) !important;
 }
 
-#clear-button {
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
-}
-
 #fullscreen-exit-button {
   list-style-image: none;
 }

themes/modern/navigator/navigator.css

@@ -386,24 +386,6 @@
   height: 16px;
 }
 
-#clear-button {
-  list-style-image: url("chrome://global/skin/icons/close.gif");
-}
-
-#clear-button:hover {
-  list-style-image: url("chrome://global/skin/icons/close-hov.gif");
-  border: none;
-  margin-left: 1px;
-  margin-right: 1px;
-}
-
-#clear-button:hover:active {
-  list-style-image: url("chrome://global/skin/icons/close-act.gif");
-  border: none;
-  margin-left: 1px;
-  margin-right: 1px;
-}
-
 #page-proxy-deck {
   cursor: grab;
   margin-right: 4px;

xpfe/browser/resources/content/navigator.js

@@ -601,12 +601,6 @@ function BrowserStop()
   }
 }
 
-function clearLocationBar()
-{
-   gURLBar.value = "";
-   gURLBar.focus();
-}
-
 function BrowserReload()
 {
   const reloadFlags = nsIWebNavigation.LOAD_FLAGS_NONE;

xpfe/browser/resources/content/navigator.xul

@@ -155,9 +155,6 @@ Contributor(s): ______________________________________. -->
       </hbox>
  
       <hbox id="nav-bar-inner" flex="1">
-        <toolbarbutton id="clear-button" oncommand="clearLocationBar();"
-                 tooltiptext="&clearButton.tooltip;"
-	         class="toolbar-button"/>
         <textbox id="urlbar" class="chromeclass-location" flex="1"
                  type="autocomplete" searchSessions="history" 
                  timeout="50" maxrows="6" alwaysopenpopup="true"

xpfe/browser/resources/locale/en-US/navigator.dtd

@@ -188,7 +188,6 @@
 <!ENTITY reloadButton.tooltip         "Reload current page">
 <!ENTITY stopButton.label             "Stop">
 <!ENTITY stopButton.tooltip           "Stop loading this page">
-<!ENTITY clearButton.tooltip          "Clear the location bar">
 <!ENTITY searchButton.label           "Search">
 <!ENTITY searchButton.tooltip         "Type a word in the field to the left, then click Search">
 <!ENTITY goButton.label               "Go">

xpfe/components/prefwindow/resources/content/pref-navigator.xul

@@ -36,7 +36,7 @@
   <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["startupPage", "browserStartupHomepage",
-                       "bookmarksButton", "clearButton", "goButton",
+                       "bookmarksButton", "goButton",
                        "homeButton", "printButton",
                        "searchButton" ];
   ]]>
@@ -101,9 +101,6 @@
       	      <checkbox id="printButton"
                         label="&printButton.label;"
                         prefstring="browser.toolbars.showbutton.print"/>
-      	      <checkbox id="clearButton"
-                        label="&clearButton.label;"
-                        prefstring="browser.toolbars.showbutton.clear"/>
       </vbox>
       <vbox id="prefShowButtonBox">
 

xpfe/components/prefwindow/resources/locale/en-US/pref-navigator.dtd

@@ -20,7 +20,6 @@
 <!ENTITY  toolbarIntro.label        "Select the buttons you want to see in the toolbars">
 
 <!ENTITY  bookmarksButton.label     "Bookmarks">
-<!ENTITY  clearButton.label         "Clear">
 <!ENTITY  goButton.label            "Go">
 <!ENTITY  homeButton.label          "Home">
 <!ENTITY  printButton.label         "Print">