bug 339635: Safebrowsing urlbar warning icon not themable

r=bryner

browser/base/content/browser.xul

@@ -260,9 +260,8 @@
             </button>
             <image id="lock-icon" onclick="if (event.button == 0) displaySecurityInfo(); event.stopPropagation();"/>
 #ifdef MOZ_SAFE_BROWSING
-            <image src="chrome://browser/skin/safebrowsing/warning16x16.png"
-                   id="safebrowsing-urlbar-icon" tooltiptext="&safeb.urlbaricon.tooltip;"
-                   style="display:none"
+            <image id="safebrowsing-urlbar-icon" tooltiptext="&safeb.urlbaricon.tooltip;"
+                   level="safe"
                    onclick="goDoCommand('safebrowsing-show-warning')" />
 #endif
           </hbox>

browser/components/safebrowsing/content/phishing-afterload-displayer.js

@@ -380,7 +380,7 @@ PROT_PhishMsgDisplayerBase.prototype.unhideLockIcon_ = function() {
  */
 PROT_PhishMsgDisplayerBase.prototype.addWarningInUrlbar_ = function() {
   var urlbarIcon = this.doc_.getElementById(this.urlbarIconId_);
-  urlbarIcon.style.display = "";
+  urlbarIcon.setAttribute('level', 'warn');
 }
 
 /**
@@ -388,7 +388,7 @@ PROT_PhishMsgDisplayerBase.prototype.addWarningInUrlbar_ = function() {
  */
 PROT_PhishMsgDisplayerBase.prototype.removeWarningInUrlbar_ = function() {
   var urlbarIcon = this.doc_.getElementById(this.urlbarIconId_);
-  urlbarIcon.style.display = "none";
+  urlbarIcon.setAttribute('level', 'safe');
 }
 
 /**

browser/themes/pinstripe/browser/safebrowsing/browser-protection.css

@@ -119,6 +119,14 @@
   font-family: arial, helvetica, sans-serif;
 }
 
-#safebrowsing-urlbar-icon { 
+#safebrowsing-urlbar-icon {
   padding-right: 2px;
 }
+
+#safebrowsing-urlbar-icon[level="safe"] {
+  list-style-image: none;
+}
+
+#safebrowsing-urlbar-icon[level="warn"] {
+  list-style-image: url("chrome://browser/skin/safebrowsing/warning16x16.png");
+}

browser/themes/winstripe/browser/safebrowsing/browser-protection.css

@@ -119,6 +119,14 @@
   font-family: arial, helvetica, sans-serif;
 }
 
-#safebrowsing-urlbar-icon { 
+#safebrowsing-urlbar-icon {
   padding-right: 2px;
 }
+
+#safebrowsing-urlbar-icon[level="safe"] {
+  list-style-image: none;
+}
+
+#safebrowsing-urlbar-icon[level="warn"] {
+  list-style-image: url("chrome://browser/skin/safebrowsing/warning16x16.png");
+}