Bug 396816 - "Location bar should be self describing: "Search Bookmarks and History"" [p=dao@mozilla.com (D��o Gottwald) ui-r=beltzner r=gavin a1.9=damons]

browser/base/content/browser.xul

@@ -289,6 +289,7 @@
       <toolbaritem id="urlbar-container" align="center" flex="400" persist="width"
                    title="&locationItem.title;" class="chromeclass-location">
         <textbox id="urlbar" flex="1"
+                 emptytext="&urlbar.emptyText;"
                  chromedir="&locale.dir;"
                  type="autocomplete"
                  autocompletesearch="history"

browser/themes/gnomestripe/browser/browser.css

@@ -751,7 +751,8 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
 }
 
 #urlbar[pageproxystate="invalid"] > #urlbar-icons > :not(#go-button) ,
-#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button {
+#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button ,
+#urlbar[empty="true"] > #urlbar-icons > #go-button {
   visibility: collapse;
 }
 

browser/themes/pinstripe/browser/browser.css

@@ -606,7 +606,8 @@ toolbar[mode="icons"] #forward-button[open="true"] {
 }
 
 #urlbar[pageproxystate="invalid"] > #urlbar-icons > :not(#go-button) ,
-#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button {
+#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button ,
+#urlbar[empty="true"] > #urlbar-icons > #go-button {
   visibility: collapse;
 }
 

browser/themes/winstripe/browser/browser.css

@@ -949,7 +949,8 @@ toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
 }
 
 #urlbar[pageproxystate="invalid"] > #urlbar-icons > :not(#go-button) ,
-#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button {
+#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button ,
+#urlbar[empty="true"] > #urlbar-icons > #go-button {
   visibility: collapse;
 }