Bug 396816 - Location bar should be self-describing: "Search Bookmarks and History". ui-r=beltzner, r=dietrich

browser/base/content/browser.css

@@ -32,6 +32,12 @@ toolbar[printpreview="true"] {
   display: none;
 }
 
+#urlbar[pageproxystate="invalid"] > #urlbar-icons > :not(#go-button) ,
+#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button ,
+#urlbar[empty="true"] > #urlbar-icons > #go-button {
+  visibility: collapse;
+}
+
 #identity-box > hbox {
   max-width: 22em;
   min-width: 1px;

browser/base/content/browser.js

@@ -997,6 +997,9 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
   else
     focusElement(content);
 
+  if (gURLBar)
+    gURLBar.setAttribute("emptytext", gURLBar.getAttribute("delayedemptytext"));
+
   gNavToolbox.customizeDone = BrowserToolboxCustomizeDone;
   gNavToolbox.customizeChange = BrowserToolboxCustomizeChange;
 
@@ -3042,6 +3045,9 @@ function BrowserToolboxCustomizeDone(aToolboxChanged) {
   // Update global UI elements that may have been added or removed
   if (aToolboxChanged) {
     gURLBar = document.getElementById("urlbar");
+    if (gURLBar)
+      gURLBar.emptyText = gURLBar.getAttribute("delayedemptytext");
+
     gProxyFavIcon = document.getElementById("page-proxy-favicon");
     gHomeButton.updateTooltip();
     gIdentityHandler._cacheElements();

browser/base/content/browser.xul

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

browser/themes/gnomestripe/browser/browser.css

@@ -791,11 +791,6 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   cursor: pointer;
 }
 
-#urlbar[pageproxystate="invalid"] > #urlbar-icons > :not(#go-button) ,
-#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button {
-  visibility: collapse;
-}
-
 #urlbar-search-splitter {
   -moz-appearance: none;
   width: 8px;

browser/themes/pinstripe/browser/browser.css

@@ -838,11 +838,6 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   min-height: 26px;
 }
 
-#urlbar[pageproxystate="invalid"] > #urlbar-icons > :not(#go-button) ,
-#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button {
-  visibility: collapse;
-}
-
 #urlbar-search-splitter {
   min-width: 4px;
   width: 4px;

browser/themes/winstripe/browser/browser.css

@@ -1053,11 +1053,6 @@ toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
   -moz-padding-end: 2px;
 }
 
-#urlbar[pageproxystate="invalid"] > #urlbar-icons > :not(#go-button) ,
-#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button {
-  visibility: collapse;
-}
-
 #urlbar-search-splitter {
   min-width: 8px;
   -moz-margin-start: -4px;