Bug 503029 - remove effectively-dead code that sets the host in the status bar's security button. r=gavin

browser/base/content/browser.css

@@ -105,12 +105,6 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-m
   display: none;
 }
 
-
-/* Bug 483950 - Hide domain name in status bar pending removal */
-#security-button > label {
-  display: none;
-}
-
 /* ::::: Fullscreen pseudo-toolbar ::::: */
 #fullscr-toggler {
   display: none;

browser/base/content/browser.js

@@ -4156,7 +4156,6 @@ var XULBrowserWindow = {
 
   // Properties used to cache security state used to update the UI
   _state: null,
-  _host: undefined,
   _tooltipText: null,
   _hostChanged: false, // onLocationChange will flip this bit
 
@@ -4181,11 +4180,13 @@ var XULBrowserWindow = {
     }
     this._state = aState;
 
+#ifdef DEBUG
     try {
       this._host = gBrowser.contentWindow.location.host;
     } catch(ex) {
       this._host = null;
     }
+#endif
 
     this._hostChanged = false;
     this._tooltipText = gBrowser.securityUI.tooltipText
@@ -4200,17 +4201,14 @@ var XULBrowserWindow = {
                               wpl.STATE_SECURE_MED |
                               wpl.STATE_SECURE_LOW;
     var level;
-    var setHost = false;
 
     switch (this._state & wpl_security_bits) {
       case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_HIGH:
         level = "high";
-        setHost = true;
         break;
       case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_MED:
       case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_LOW:
         level = "low";
-        setHost = true;
         break;
       case wpl.STATE_IS_BROKEN:
         level = "broken";
@@ -4231,11 +4229,6 @@ var XULBrowserWindow = {
         gURLBar.removeAttribute("level");
     }
 
-    if (setHost && this._host)
-      this.securityButton.setAttribute("label", this._host);
-    else
-      this.securityButton.removeAttribute("label");
-
     this.securityButton.setAttribute("tooltiptext", this._tooltipText);
 
     // Don't pass in the actual location object, since it can cause us to 

browser/base/content/browser.xul

@@ -601,7 +601,7 @@
       <statusbarpanel id="download-monitor" class="statusbarpanel-iconic-text"
                       tooltiptext="&downloadMonitor2.tooltip;" hidden="true"
                       command="Tools:Downloads"/>
-      <statusbarpanel id="security-button" class="statusbarpanel-iconic-text"
+      <statusbarpanel id="security-button" class="statusbarpanel-iconic"
                       hidden="true"
                       onclick="if (event.button == 0 &amp;&amp; event.detail == 1) displaySecurityInfo();"/>
       <statusbarpanel id="page-report-button" type="menu"

browser/themes/gnomestripe/browser/browser.css

@@ -1109,11 +1109,6 @@ statusbarpanel#statusbar-display {
   -moz-padding-start: 0;
 }
 
-#security-button {
-  min-width: 20px;
-  -moz-box-direction: reverse;
-}
-
 #security-button[level="high"],
 #security-button[level="low"] {
   list-style-image: url("chrome://browser/skin/Secure.png");
@@ -1123,11 +1118,6 @@ statusbarpanel#statusbar-display {
   list-style-image: url("chrome://browser/skin/Security-broken.png");
 }
 
-/* XXXsw prevent margins of a value-less label from shifting the image */
-#security-button > label:not([value]) {
-  display: none;
-}
-
 #page-report-button {
   list-style-image: url("chrome://browser/skin/Info.png");
   width: 20px;

browser/themes/pinstripe/browser/browser.css

@@ -1406,10 +1406,6 @@ sidebarheader > .tabs-closebutton > .toolbarbutton-text {
 
 /* ----- SECURITY DISPLAY ----- */
 
-#security-button {
-  -moz-box-direction: reverse;
-}
-
 #security-button[level="high"] ,
 #security-button[level="low"] {
   list-style-image: url("chrome://browser/skin/Secure-statusbar.png");

browser/themes/winstripe/browser/browser.css

@@ -1286,11 +1286,6 @@ statusbarpanel#statusbar-display {
   border-top: none;
 }
 
-#security-button {
-  min-width: 20px;
-  -moz-box-direction: reverse;
-}
-
 #security-button[level="high"],
 #security-button[level="low"] {
   list-style-image: url("chrome://browser/skin/Secure.png");
@@ -1300,11 +1295,6 @@ statusbarpanel#statusbar-display {
   list-style-image: url("chrome://browser/skin/Security-broken.png");
 }
 
-/* XXXsw prevent margins of a value-less label from shifting the image */
-#security-button > label:not([value]) {
-  display: none;
-}
-
 #page-report-button {
   width: 20px;
   list-style-image: url("chrome://browser/skin/Info.png");