Bug 601060 - Hovering links shows "moz-action:switchtab" text and hides "Switch to tab:" label in URL bar when it contains a switch-to-tab URL. r=dao

browser/base/content/browser.css

@@ -279,7 +279,7 @@ panel[noactions] > richlistbox > richlistitem[type~="action"] > .ac-url-box > .a
   visibility: visible;
 }
 
-#urlbar:not([actiontype]) > #urlbar-display {
+#urlbar:not([actiontype]) > #urlbar-display-box {
   display: none;
 }
 

browser/base/content/browser.xul

@@ -571,7 +571,9 @@
               </hbox>
             </hbox>
           </box>
+          <box id="urlbar-display-box" align="center">
             <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
+          </box>
           <hbox id="urlbar-icons">
             <image id="page-report-button"
                    class="urlbar-icon"

browser/base/content/urlbarBindings.xml

@@ -783,7 +783,8 @@
             overLink.style.maxWidth = maxWidth + "px";
           }
 
-          this._originLabel.value = this.value;
+          var action = this._parseActionUrl(this._value);
+          this._originLabel.value = action ? action.param : this._value;
         ]]></body>
       </method>
 

browser/themes/gnomestripe/browser/browser.css

@@ -943,17 +943,19 @@ toolbar[iconsize="small"] #feed-button {
   -moz-margin-start: 0;
 }
 
-#urlbar-display {
-  margin-top: -2px;
-  margin-bottom: -2px;
-  padding-top: 3px;
-  padding-bottom: 2px;
-  -moz-padding-end: 3px;
-  color: GrayText;
+#urlbar-display-box {
+  margin-top: -1px;
+  margin-bottom: -1px;
   -moz-border-end: 1px solid #AAA;
   -moz-margin-end: 3px;
 }
 
+#urlbar-display {
+  margin-top: 0;
+  margin-bottom: 0;
+  color: GrayText;
+}
+
 #PopupAutoComplete,
 #PopupAutoCompleteRichResult {
   direction: ltr !important;

browser/themes/pinstripe/browser/browser.css

@@ -886,17 +886,17 @@ toolbar[mode="icons"] #zoom-in-button {
   max-width: 20em;
 }
 
-#urlbar-display {
-  margin-top: -3px;
-  margin-bottom: -2px;
-  padding-top: 3px;
-  padding-bottom: 2px;
-  -moz-padding-end: 3px;
-  color: GrayText;
+#urlbar-display-box {
   -moz-border-end: 1px solid #AAA;
   -moz-margin-end: 3px;
 }
 
+#urlbar-display {
+  margin-top: 0;
+  margin-bottom: 0;
+  color: GrayText;
+}
+
 #PopupAutoCompleteRichResult {
   direction: ltr !important;
   margin-top: 2px;

browser/themes/winstripe/browser/browser.css

@@ -1128,17 +1128,19 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   -moz-box-align: stretch;
 }
 
-#urlbar-display {
+#urlbar-display-box {
   margin-top: -2px;
   margin-bottom: -2px;
-  padding-top: 3px;
-  padding-bottom: 2px;
-  -moz-padding-end: 3px;
-  color: GrayText;
   -moz-border-end: 1px solid #AAA;
   -moz-margin-end: 3px;
 }
 
+#urlbar-display {
+  margin-top: 0;
+  margin-bottom: 0;
+  color: GrayText;
+}
+
 /* over-link in location bar */
 
 .urlbar-origin-label {