Bug 587901 - Remove favicon from Location Bar and add indicator for sites without identity information. r+a=dolske

browser/app/profile/firefox.js

@@ -841,10 +841,12 @@ pref("places.frecency.unvisitedTypedBonus", 200);
 // 2 - pre-populate site URL and pre-fetch certificate
 pref("browser.ssl_override_behavior", 2);
 
-// Controls the display of domain in the identity box for SSL connections.
+// Controls the display of domain in the identity box.
 // 0 - do not show domain
 // 1 - show effectiveTLD + 1 (e.g. mozilla.org)
 // 2 - show full domain (e.g. bugzilla.mozilla.org)
+pref("browser.identity.domain_display", 1);
+// Same as above, for SSL connections.
 pref("browser.identity.ssl_domain_display", 1);
 
 // True if the user should be prompted when a web application supports

browser/base/content/browser.css

@@ -181,11 +181,6 @@ richlistitem[type~="action"]:-moz-locale-dir(rtl) > .ac-url-box {
   -moz-binding: url("chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup");
 }
 
-#urlbar-throbber:not([busy="true"]),
-#urlbar-throbber[busy="true"] + #page-proxy-favicon {
-  display: none;
-}
-
 #feed-button > .button-box > .box-inherit > .button-text,
 #feed-button > .button-box > .button-menu-dropmarker {
   display: none;
@@ -212,7 +207,7 @@ richlistitem[type~="action"]:-moz-locale-dir(rtl) > .ac-url-box {
   direction: ltr;
 }
 
-#identity-box.verifiedIdentity > #identity-box-inner > #identity-icon-labels > #identity-icon-label {
+#identity-box.verifiedIdentity > #identity-icon-labels > #identity-icon-label {
   -moz-margin-end: 0.25em !important;
 }
 

browser/base/content/browser.js

@@ -77,7 +77,6 @@ const nsIWebNavigation = Ci.nsIWebNavigation;
 var gCharsetMenu = null;
 var gLastBrowserCharset = null;
 var gPrevCharset = null;
-var gProxyFavIcon = null;
 var gLastValidURLStr = "";
 var gInPrintPreviewMode = false;
 var gDownloadMgr = null;
@@ -2391,7 +2390,7 @@ var LocationBarHelpers = {
   _searchBegin: function LocBar_searchBegin() {
     function delayedBegin(self) {
       self._timeoutID = null;
-      document.getElementById("urlbar-throbber").setAttribute("busy", "true");
+      gURLBar.setAttribute("searching", "true");
     }
 
     this._timeoutID = setTimeout(delayedBegin, 500, this);
@@ -2403,7 +2402,7 @@ var LocationBarHelpers = {
       clearTimeout(this._timeoutID);
       this._timeoutID = null;
     }
-    document.getElementById("urlbar-throbber").removeAttribute("busy");
+    gURLBar.removeAttribute("searching");
   }
 };
 
@@ -2418,47 +2417,18 @@ function SetPageProxyState(aState)
   if (!gURLBar)
     return;
 
-  if (!gProxyFavIcon)
-    gProxyFavIcon = document.getElementById("page-proxy-favicon");
-
   gURLBar.setAttribute("pageproxystate", aState);
-  gProxyFavIcon.setAttribute("pageproxystate", aState);
 
   // the page proxy state is set to valid via OnLocationChange, which
   // gets called when we switch tabs.
   if (aState == "valid") {
     gLastValidURLStr = gURLBar.value;
     gURLBar.addEventListener("input", UpdatePageProxyState, false);
-
-    PageProxySetIcon(gBrowser.getIcon());
   } else if (aState == "invalid") {
     gURLBar.removeEventListener("input", UpdatePageProxyState, false);
-    PageProxyClearIcon();
   }
 }
 
-function PageProxySetIcon (aURL)
-{
-  if (!gProxyFavIcon)
-    return;
-
-  if (!aURL)
-    PageProxyClearIcon();
-  else if (gProxyFavIcon.getAttribute("src") != aURL)
-    gProxyFavIcon.setAttribute("src", aURL);
-}
-
-function PageProxyClearIcon ()
-{
-  gProxyFavIcon.removeAttribute("src");
-}
-
-function PageProxyClickHandler(aEvent)
-{
-  if (aEvent.button == 1 && gPrefService.getBoolPref("middlemouse.paste"))
-    middleMousePaste(aEvent);
-}
-
 function BrowserImport()
 {
 #ifdef XP_MACOSX
@@ -2872,24 +2842,6 @@ var browserDragAndDrop = {
   drop: function (aEvent, aName) Services.droppedLinkHandler.dropLink(aEvent, aName)
 }
 
-var proxyIconDNDObserver = {
-  onDragStart: function (aEvent, aXferData, aDragAction)
-    {
-      if (gProxyFavIcon.getAttribute("pageproxystate") != "valid")
-        return;
-
-      var value = content.location.href;
-      var urlString = value + "\n" + content.document.title;
-      var htmlString = "<a href=\"" + value + "\">" + value + "</a>";
-
-      var dt = aEvent.dataTransfer;
-      dt.setData("text/x-moz-url", urlString);
-      dt.setData("text/uri-list", value);
-      dt.setData("text/plain", value);
-      dt.setData("text/html", htmlString);
-    }
-}
-
 var homeButtonObserver = {
   onDrop: function (aEvent)
     {
@@ -3503,7 +3455,6 @@ function BrowserToolboxCustomizeDone(aToolboxChanged) {
   if (aToolboxChanged) {
     gURLBar = document.getElementById("urlbar");
 
-    gProxyFavIcon = document.getElementById("page-proxy-favicon");
     gHomeButton.updateTooltip();
     gIdentityHandler._cacheElements();
     window.XULBrowserWindow.init();
@@ -4056,11 +4007,6 @@ var XULBrowserWindow = {
     }
   },
 
-  onLinkIconAvailable: function (aIconURL) {
-    if (gProxyFavIcon && gBrowser.userTypedValue === null)
-      PageProxySetIcon(aIconURL); // update the favicon in the URL bar
-  },
-
   onProgressChange: function (aWebProgress, aRequest,
                               aCurSelfProgress, aMaxSelfProgress,
                               aCurTotalProgress, aMaxTotalProgress) {
@@ -7111,6 +7057,13 @@ var gIdentityHandler = {
       icon_label = "";
       icon_country_label = "";
       icon_labels_dir = "ltr";
+      switch (Services.prefs.getIntPref("browser.identity.domain_display")) {
+        case 2 : // Show full domain
+          icon_label = this._lastLocation.hostname;
+          break;
+        case 1 : // Show eTLD.
+          icon_label = this.getEffectiveHost();
+      }
     }
 
     // Push the appropriate strings out to the UI
@@ -7192,6 +7145,11 @@ var gIdentityHandler = {
 
     event.stopPropagation();
 
+    if (event.button == 1 && Services.prefs.getBoolPref("middlemouse.paste")) {
+      middleMousePaste(event);
+      return;
+    }
+
     if ((event.type == "click" && event.button != 0) ||
         (event.type == "keypress" && event.charCode != KeyEvent.DOM_VK_SPACE &&
          event.keyCode != KeyEvent.DOM_VK_RETURN))
@@ -7225,6 +7183,22 @@ var gIdentityHandler = {
 
     // Now open the popup, anchored off the primary chrome element
     this._identityPopup.openPopup(this._identityBox, position);
+  },
+
+  onDragStart: function (event) {
+    if (gURLBar.getAttribute("pageproxystate") != "valid")
+      return;
+
+    var value = content.location.href;
+    var urlString = value + "\n" + content.document.title;
+    var htmlString = "<a href=\"" + value + "\">" + value + "</a>";
+
+    var dt = event.dataTransfer;
+    dt.setData("text/x-moz-url", urlString);
+    dt.setData("text/uri-list", value);
+    dt.setData("text/plain", value);
+    dt.setData("text/html", htmlString);
+    dt.setDragImage(event.currentTarget, 0, 0);
   }
 };
 

browser/base/content/browser.xul

@@ -876,30 +876,26 @@
                  onsearchcomplete="LocationBarHelpers._searchComplete();"
                  onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
                  onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
-          <box id="notification-popup-box" hidden="true" align="center">
-            <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
-            <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
-          </box>
           <!-- Use onclick instead of normal popup= syntax since the popup
                code fires onmousedown, and hence eats our favicon drag events.
                We only add the identity-box button to the tab order when the location bar
                has focus, otherwise pressing F6 focuses it instead of the location bar -->
-          <box id="identity-box" role="button"
-               onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
-               onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);">
-            <hbox id="identity-box-inner" align="center">
-              <stack id="page-proxy-stack"
-                     onclick="PageProxyClickHandler(event);">
-                <image id="urlbar-throbber" busy="false"/>
-                <image id="page-proxy-favicon" validate="never"
-                       pageproxystate="invalid"
-                       ondragstart="proxyIconDNDObserver.onDragStart(event);"
-                       onerror="this.removeAttribute('src');"/>
-              </stack>
+          <box id="identity-container">
+            <hbox id="notification-popup-box" hidden="true" align="center">
+              <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
+              <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
+            </hbox>
+            <hbox id="identity-box"
+                  align="center"
+                  role="button"
+                  onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
+                  onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
+                  ondragstart="gIdentityHandler.onDragStart(event);">
               <hbox id="identity-icon-labels">
                 <label id="identity-icon-label" class="plain" flex="1"/>
                 <label id="identity-icon-country-label" class="plain"/>
               </hbox>
+              <image id="identity-dropmarker"/>
             </hbox>
           </box>
           <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>

browser/base/content/test/browser_discovery.js

@@ -36,7 +36,7 @@ var iconDiscoveryTests = [
 function runIconDiscoveryTest() {
   var test = iconDiscoveryTests[0];
   var head = doc().getElementById("linkparent");
-  var hasSrc = gProxyFavIcon.hasAttribute("src");
+  var hasSrc = gBrowser.getIcon() != null;
   if (test.pass)
     ok(hasSrc, test.text);
   else
@@ -50,7 +50,7 @@ function runIconDiscoveryTest() {
 function iconDiscovery() {
   setHandlerFunc(runIconDiscoveryTest);
   if (iconDiscoveryTests.length) {
-    gProxyFavIcon.removeAttribute("src");
+    gBrowser.setIcon(gBrowser.selectedTab, null);
 
     var test = iconDiscoveryTests[0];
     var head = doc().getElementById("linkparent");

browser/base/content/test/browser_drag.js

@@ -17,12 +17,11 @@ function test()
       data  : htmlString }
   ] ];
   // set the valid attribute so dropping is allowed
-  var proxyicon = document.getElementById("page-proxy-favicon")
-  var oldstate = proxyicon.getAttribute("pageproxystate");
-  proxyicon.setAttribute("pageproxystate", "valid");
-  var dt = EventUtils.synthesizeDragStart(proxyicon, expected);
+  var oldstate = gURLBar.getAttribute("pageproxystate");
+  gURLBar.setAttribute("pageproxystate", "valid");
+  var dt = EventUtils.synthesizeDragStart(document.getElementById("identity-box"), expected);
   is(dt, null, "drag on proxy icon");
-  proxyicon.setAttribute("pageproxystate", oldstate);
+  gURLBar.setAttribute("pageproxystate", oldstate);
   // Now, the identity information panel is opened by the proxy icon click.
   // We need to close it for next tests.
   EventUtils.synthesizeKey("VK_ESCAPE", {}, window);

browser/components/sidebar/src/nsSidebar.js

@@ -197,7 +197,7 @@ function (aDescriptionURL)
   if (browser.shouldLoadFavIcon(browser.selectedBrowser
                                        .contentDocument
                                        .documentURIObject))
-    iconURL = win.gProxyFavIcon.getAttribute("src");
+    iconURL = win.gBrowser.getIcon();
   
   if (!this.validateSearchEngine(aDescriptionURL, iconURL))
     return;

browser/themes/gnomestripe/browser/browser.css

@@ -877,69 +877,60 @@ toolbar[iconsize="small"] #fullscreen-button {
   direction: ltr;
 }
 
-/* Favicon */
-#page-proxy-favicon,
-#urlbar-throbber {
-  width: 16px;
-  height: 16px;
-}
-
-#page-proxy-stack {
-  width: 24px;
-  height: 20px;
-  padding: 2px 4px;
-  background: url(urlbar-favicon-glow.png) center center no-repeat;
-}
-
-#page-proxy-favicon:not([src]) {
-  list-style-image: url("chrome://global/skin/icons/folder-item.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-#page-proxy-favicon[pageproxystate="invalid"] {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-
-#urlbar-throbber {
-  list-style-image: url("chrome://browser/skin/places/searching_16.png");
-}
-
 /* Identity indicator */
-#identity-box {
-  background: -moz-dialog -moz-linear-gradient(rgba(255,255,255,.25), rgba(0,0,0,.15));
-  color: -moz-dialogtext;
-  -moz-border-end: 1px solid ThreeDShadow;
+
+#identity-container {
+  min-height: 20px;
 }
 
-#identity-box:-moz-locale-dir(rtl) {
+#identity-container:-moz-locale-dir(rtl) {
   -moz-border-start: 1px solid ThreeDShadow;
 }
 
+#notification-popup-box,
+#identity-box {
+  background-color: rgb(95%,95%,95%);
+  background-image: -moz-linear-gradient(rgba(170,170,170,.25), rgba(0,0,0,.3));
+  -moz-border-end: 1px solid ThreeDShadow;
+  color: #444;
+  text-shadow: 0 1px 0 rgba(255,255,255,.25);
+}
+
+#identity-box {
+  padding: 0 1px;
+}
+
 #identity-box:-moz-focusring {
   outline: 1px dotted -moz-DialogText;
 }
 
-#identity-box:hover {
-  background-image: -moz-linear-gradient(rgba(255,255,255,.5), rgba(50%,50%,50%,.2), rgba(0,0,0,.15));
-}
-
 #identity-box:hover:active,
 #identity-box[open="true"] {
   background-image: -moz-linear-gradient(rgba(0,0,0,.4), rgba(0,0,0,.1));
 }
 
 #identity-icon-labels {
-  padding: 0 2px;
+  -moz-padding-start: 4px;
+  -moz-transform: translate(0, -1px);
 }
 
 #identity-box.verifiedDomain {
-  background-color: rgba(30, 80, 170, 0.7);
-  color: white;
+  background-color: hsl(219,75%,80%);
+  color: #333;
 }
 
 #identity-box.verifiedIdentity {
-  background-color: rgba(50, 150, 50, 0.8);
-  color: white;
+  background-color: hsl(92,75%,72%);
+}
+
+#identity-dropmarker {
+  -moz-appearance: toolbarbutton-dropdown;
+  width: 12px;
+  height: 12px;
+}
+
+#urlbar[pageproxystate="invalid"] > #identity-container > #identity-box {
+  opacity: .5;
 }
 
 /* Identity popup icons */
@@ -1035,8 +1026,9 @@ toolbar[iconsize="small"] #fullscreen-button {
 }
 
 /* Notification icon box */
+
 #notification-popup-box {
-  margin: 0 3px;
+  padding: 0 3px;
 }
 
 .notification-anchor-icon {

browser/themes/gnomestripe/browser/jar.mn

@@ -37,7 +37,6 @@ browser.jar:
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/Toolbar.png
   skin/classic/browser/Toolbar-small.png
-  skin/classic/browser/urlbar-favicon-glow.png
   skin/classic/browser/feeds/feedIcon.png             (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png           (feeds/feedIcon16.png)
   skin/classic/browser/feeds/videoFeedIcon.png        (feeds/videoFeedIcon.png)

browser/themes/gnomestripe/browser/searchbar.css

@@ -33,7 +33,7 @@
   -moz-margin-end: 2px;
   border: 0;
   -moz-box-align: center;
-  background: -moz-dialog -moz-linear-gradient(rgba(255,255,255,.25), rgba(0,0,0,.15));
+  background: rgb(95%,95%,95%) -moz-linear-gradient(rgba(170,170,170,.25), rgba(0,0,0,.3));
   -moz-border-end: 1px solid ThreeDShadow;
 }
 
@@ -44,10 +44,6 @@
   border: 0;
 }
 
-.searchbar-engine-button:hover {
-  background-image: -moz-linear-gradient(rgba(255,255,255,.5), rgba(50%,50%,50%,.2), rgba(0,0,0,.15));
-}
-
 .searchbar-engine-button:hover:active,
 .searchbar-engine-button[open="true"] {
   background-image: -moz-linear-gradient(rgba(0,0,0,.4), rgba(0,0,0,.1));

browser/themes/pinstripe/browser/browser.css

@@ -699,10 +699,13 @@ toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl) {
 
 #identity-box {
   margin: 1px;
+  -moz-margin-end: 3px;
   -moz-border-radius: 2px;
   padding: 1px;
   -moz-box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
   text-shadow: 0 1px rgba(255, 255, 255, 0.2);
+  background-image: -moz-linear-gradient(#eee, #ccc);
+  min-height: 18px;
 }
 
 
@@ -711,22 +714,18 @@ toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl) {
                    0 0 3px 2px -moz-mac-focusring;
 }
 
-#identity-box {
-  color: white;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.7);
-  -moz-margin-end: 3px;
-}
-
-#identity-box {
-  background-image: -moz-linear-gradient(#FFF, #DDD);
-}
-
 #identity-box:active:hover,
 #identity-box[open="true"] {
   -moz-box-shadow: inset 0 2px 7px rgba(0, 0, 0, 0.35),
                    inset 0 0 0 20px rgba(0, 0, 0, 0.06);
 }
 
+#identity-box.verifiedDomain,
+#identity-box.verifiedIdentity {
+  color: white;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.7);
+}
+
 #identity-box.verifiedDomain {
   background-image: -moz-linear-gradient(#588EC6, #3C68AE);
 }
@@ -736,7 +735,17 @@ toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl) {
 }
 
 #identity-icon-labels {
-  margin: 0 4px 1px;
+  -moz-margin-start: 3px;
+  margin-bottom: 1px;
+}
+
+#identity-dropmarker {
+  list-style-image: url(toolbarbutton-dropmarker.png);
+  margin: 0 3px;
+}
+
+#urlbar[pageproxystate="invalid"] > #identity-container > #identity-box {
+  opacity: .5;
 }
 
 #urlbar > .autocomplete-textbox-container > .textbox-input-box {
@@ -757,43 +766,6 @@ toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl) {
   height: 22px;
 }
 
-#page-proxy-favicon,
-#urlbar-throbber {
-  width: 16px;
-  height: 16px;
-  margin: 0px;
-  padding: 0px;
-}
-
-#page-proxy-stack {
-  width: 18px;
-  height: 16px;
-  padding: 0 1px;
-}
-
-#identity-box.verifiedIdentity > hbox > #page-proxy-stack,
-#identity-box.verifiedDomain > hbox > #page-proxy-stack {
-  width: 24px;
-  padding: 0 4px;
-}
-
-#identity-box.verifiedIdentity > hbox > #page-proxy-stack,
-#identity-box.verifiedDomain > hbox > #page-proxy-stack {
-  background: url(urlbar-favicon-glow.png) center center no-repeat;
-}
-
-#page-proxy-favicon:not([src]) {
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-
-#page-proxy-favicon[pageproxystate="invalid"] {
-  opacity: 0.5;
-}
-
-#urlbar-throbber {
-  list-style-image: url("chrome://browser/skin/places/searching_16.png");
-}
-
 #wrapper-urlbar-container[place="palette"] {
   max-width: 20em;
 }
@@ -1917,7 +1889,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 #notification-popup-box {
-  margin: 0 3px;
+  padding: 0 3px;
 }
 
 .notification-anchor-icon {

browser/themes/pinstripe/browser/jar.mn

@@ -55,7 +55,6 @@ browser.jar:
   skin/classic/browser/Secure-background.gif
   skin/classic/browser/Toolbar.png
   skin/classic/browser/toolbarbutton-dropmarker.png
-  skin/classic/browser/urlbar-favicon-glow.png
   skin/classic/browser/feeds/subscribe.css                  (feeds/subscribe.css)
   skin/classic/browser/feeds/subscribe-ui.css               (feeds/subscribe-ui.css)
   skin/classic/browser/feeds/feedIcon.png                   (feeds/feedIcon.png)

browser/themes/winstripe/browser/browser.css

@@ -1005,14 +1005,18 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
 /* identity box */
 
 #identity-box {
-  background-color: -moz-dialog;
-  background-image: -moz-linear-gradient(rgba(255,255,255,.25), rgba(0,0,0,.15));
-  color: -moz-dialogText;
+  background-color: rgb(95%,95%,95%);
+  background-image: -moz-linear-gradient(rgba(255,255,255,.5), rgba(70%,70%,70%,.1), rgba(0,0,0,.1));
+  background-origin: border-box;
+  border: 1px solid rgba(0,0,0,.15);
   -moz-border-radius: 2px;
-}
-
-#identity-box:hover {
-  background-image: -moz-linear-gradient(rgba(255,255,255,.5), rgba(50%,50%,50%,.2), rgba(0,0,0,.15));
+  -moz-box-shadow: 0 1px 0 rgba(0,0,0,.1),
+                   0 0 1px rgba(255,255,255,.4) inset;
+  min-height: 16px;
+  padding: 0 2px;
+  font-weight: bold;
+  color: #666;
+  text-shadow: 0 1px 0 rgba(255,255,255,.25);
 }
 
 #identity-box[open="true"],
@@ -1022,33 +1026,36 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
 
 #identity-box.verifiedDomain,
 #identity-box.verifiedIdentity {
-  color: white;
-  text-shadow: 0 1px 0 rgba(0,0,0,.25);
-  -moz-box-shadow: 0 0 0 1px rgba(0,0,0,.2) inset;
+  color: #444;
+  border-color: rgba(0,0,0,.3);
 }
 
 #identity-box.verifiedDomain {
-  background-color: hsl(219,45%,60%);
+  background-color: hsl(219,75%,80%);
 }
 
 #identity-box.verifiedIdentity {
-  background-color: hsl(92,45%,52%);
+  background-color: hsl(92,75%,72%);
 }
 
 #identity-box:-moz-focusring {
-  outline: 1px dotted -moz-DialogText;
+  outline: 1px dotted #444;
   outline-offset: -3px;
 }
 
-#identity-box.verifiedDomain:-moz-focusring,
-#identity-box.verifiedIdentity:-moz-focusring {
-  outline-color: white;
+#identity-icon-labels {
+  -moz-margin-start: 3px;
+  -moz-transform: translate(0, -1px);
 }
 
-#identity-icon-labels {
-  -moz-margin-start: 1px;
-  -moz-margin-end: 3px;
-  -moz-transform: translate(0, -1px);
+#identity-dropmarker {
+  list-style-image: url(identity-button-dropdown.png);
+  margin-bottom: 1px;
+}
+
+#identity-box:not(.verifiedDomain):not(.verifiedIdentity) > #identity-dropmarker,
+#urlbar[pageproxystate="invalid"] > #identity-container > #identity-box {
+  opacity: .5;
 }
 
 /* Location bar dropmarker */
@@ -1072,34 +1079,6 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
   -moz-image-region: rect(0, 26px, 11px, 13px);
 }
 
-/* page proxy icon */
-
-#page-proxy-favicon,
-#urlbar-throbber {
-  width: 16px;
-  height: 16px;
-}
-
-#page-proxy-stack {
-  width: 24px;
-  height: 18px;
-  padding: 1px 4px;
-  background: url(urlbar-favicon-glow.png) center center no-repeat;
-}
-
-#page-proxy-favicon:not([src]) {
-  list-style-image: url("chrome://global/skin/icons/folder-item.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px)
-}
-
-#page-proxy-favicon[pageproxystate="invalid"] {
-  -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-
-#urlbar-throbber {
-  list-style-image: url("chrome://browser/skin/places/searching_16.png");
-}
-
 /* autocomplete */
 
 #PopupAutoComplete,
@@ -1886,8 +1865,9 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 /* Notification icon box */
+
 #notification-popup-box {
-  margin: 0 3px;
+  padding: 0 3px;
 }
 
 .notification-anchor-icon {

browser/themes/winstripe/browser/jar.mn

@@ -21,6 +21,7 @@ browser.jar:
         skin/classic/browser/Geolocation-64.png
         skin/classic/browser/Info.png                                (Info.png)
         skin/classic/browser/identity.png                            (identity.png)
+        skin/classic/browser/identity-button-dropdown.png
         skin/classic/browser/keyhole-forward-mask.svg
         skin/classic/browser/KUI-background.png
         skin/classic/browser/KUI-close.png
@@ -48,7 +49,6 @@ browser.jar:
         skin/classic/browser/menu-forward.png                        (menu-forward.png)
         skin/classic/browser/monitor.png
         skin/classic/browser/monitor_16-10.png
-        skin/classic/browser/urlbar-favicon-glow.png
         skin/classic/browser/feeds/feed-icons-16.png                 (feeds/feed-icons-16.png)
         skin/classic/browser/feeds/feedIcon.png                      (feeds/feedIcon.png)
         skin/classic/browser/feeds/feedIcon16.png                    (feeds/feedIcon16.png)
@@ -135,6 +135,7 @@ browser.jar:
         skin/classic/aero/browser/Geolocation-64.png
         skin/classic/aero/browser/Info.png                           (Info-aero.png)
         skin/classic/aero/browser/identity.png                       (identity-aero.png)
+        skin/classic/aero/browser/identity-button-dropdown.png
         skin/classic/aero/browser/keyhole-forward-mask.svg
         skin/classic/aero/browser/KUI-background.png
         skin/classic/aero/browser/KUI-close.png
@@ -162,7 +163,6 @@ browser.jar:
         skin/classic/aero/browser/menu-forward.png                   (menu-forward-aero.png)
         skin/classic/aero/browser/monitor.png
         skin/classic/aero/browser/monitor_16-10.png
-        skin/classic/aero/browser/urlbar-favicon-glow.png
         skin/classic/aero/browser/feeds/feed-icons-16.png            (feeds/feed-icons-16-aero.png)
         skin/classic/aero/browser/feeds/feedIcon.png                 (feeds/feedIcon-aero.png)
         skin/classic/aero/browser/feeds/feedIcon16.png               (feeds/feedIcon16-aero.png)

extensions/cookie/test/browser_test_favicon.js

@@ -5,29 +5,23 @@
 function test() {
   waitForExplicitFinish();
 
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-                        .getService(Components.interfaces.nsIPrefBranch);
-  prefs.setIntPref("network.cookie.cookieBehavior", 1);
+  Services.prefs.setIntPref("network.cookie.cookieBehavior", 1);
 
-  var os = Components.classes["@mozilla.org/observer-service;1"]
-                     .getService(Components.interfaces.nsIObserverService);
-  os.addObserver(function (theSubject, theTopic, theData) {
+  Services.obs.addObserver(function (theSubject, theTopic, theData) {
     var uri = theSubject.QueryInterface(Components.interfaces.nsIURI);
     var domain = uri.host;
 
     if (domain == "example.org") {
       ok(true, "foreign favicon cookie was blocked");
 
-      var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-                            .getService(Components.interfaces.nsIPrefBranch);
-      prefs.setIntPref("network.cookie.cookieBehavior", 0);
+      Services.prefs.setIntPref("network.cookie.cookieBehavior", 0);
 
-      os.removeObserver(arguments.callee, "cookie-rejected");
+      Services.obs.removeObserver(arguments.callee, "cookie-rejected");
 
       finish();
     }
   }, "cookie-rejected", false);
 
   // kick off a favicon load
-  PageProxySetIcon("http://example.org/tests/extensions/cookie/test/damonbowling.jpg");
+  gBrowser.setIcon(gBrowser.selectedTab, "http://example.org/tests/extensions/cookie/test/damonbowling.jpg");
 }