Bug 742419 - Implement new identity block design (browser/base, browser/app, and Windows). r=dao
authorJared Wein <jwein@mozilla.com>
Sat, 21 Apr 2012 00:03:31 -0700
changeset 93885 479edc4c0af425bb818507c6b40f4a613862ea4b
parent 93884 0dd02041e575b08a009b0909603bff9ad25951f2
child 93886 e79686174491e2e2ddb49d706d05d2bcb2f313b1
push idunknown
push userunknown
push dateunknown
reviewersdao
bugs742419
milestone14.0a1
Bug 742419 - Implement new identity block design (browser/base, browser/app, and Windows). r=dao
browser/app/profile/firefox.js
browser/base/content/browser.js
browser/base/content/browser.xul
browser/base/content/test/browser_identity_UI.js
browser/themes/winstripe/browser.css
browser/themes/winstripe/identity-icons-generic.png
browser/themes/winstripe/identity-icons-https-ev.png
browser/themes/winstripe/identity-icons-https.png
browser/themes/winstripe/jar.mn
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -872,17 +872,17 @@ pref("places.frecency.unvisitedTypedBonu
 // 1 - pre-populate site URL, but don't fetch certificate
 // 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.
 // 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.ssl_domain_display", 1);
+pref("browser.identity.ssl_domain_display", 0);
 
 // True if the user should be prompted when a web application supports
 // offline apps.
 pref("browser.offline-apps.notify", true);
 
 // if true, use full page zoom instead of text zoom
 pref("browser.zoom.full", true);
 
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2681,38 +2681,19 @@ function SetPageProxyState(aState)
   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);
 }
 
@@ -4624,21 +4605,16 @@ var XULBrowserWindow = {
     let [longHost, shortHost] =
       linkHost.length > docHost.length ? [linkHost, docHost] : [docHost, linkHost];
     if (longHost == "www." + shortHost)
       return originalTarget;
 
     return "_blank";
   },
 
-  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) {
     // Do nothing.
   },
 
   onProgressChange64: function (aWebProgress, aRequest,
                                 aCurSelfProgress, aMaxSelfProgress,
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -537,19 +537,18 @@
                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);"
                ondragstart="gIdentityHandler.onDragStart(event);">
             <hbox id="identity-box-inner" align="center">
               <hbox id="page-proxy-stack"
                     onclick="PageProxyClickHandler(event);">
-                <image id="page-proxy-favicon" validate="never"
-                       pageproxystate="invalid"
-                       onerror="this.removeAttribute('src');"/>
+                <image id="page-proxy-favicon"
+                       pageproxystate="invalid"/>
               </hbox>
               <hbox id="identity-icon-labels">
                 <label id="identity-icon-label" class="plain" flex="1"/>
                 <label id="identity-icon-country-label" class="plain"/>
               </hbox>
             </hbox>
           </box>
           <box id="urlbar-display-box" align="center">
--- a/browser/base/content/test/browser_identity_UI.js
+++ b/browser/base/content/test/browser_identity_UI.js
@@ -1,11 +1,14 @@
 /* Tests for correct behaviour of getEffectiveHost on identity handler */
 function test() {
   waitForExplicitFinish();
+  registerCleanupFunction(function() {
+    Services.prefs.clearUserPref("browser.identity.ssl_domain_display");
+  });
 
   ok(gIdentityHandler, "gIdentityHandler should exist");
 
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", checkResult, true);
 
   nextTest();
 }
@@ -67,44 +70,58 @@ var tests = [
     effectiveHost: "127.0.0.1"
   },
 ]
 
 let gCurrentTest, gCurrentTestIndex = -1, gTestDesc;
 // Go through the tests in both directions, to add additional coverage for
 // transitions between different states.
 let gForward = true;
+let gCheckETLD = false;
 function nextTest() {
-  if (gForward)
-    gCurrentTestIndex++;
-  else
-    gCurrentTestIndex--;
+  if (!gCheckETLD) {
+    if (gForward)
+      gCurrentTestIndex++;
+    else
+      gCurrentTestIndex--;
 
-  if (gCurrentTestIndex == tests.length) {
-    // Went too far, reverse
-    gCurrentTestIndex--;
-    gForward = false;
-  }
+    if (gCurrentTestIndex == tests.length) {
+      // Went too far, reverse
+      gCurrentTestIndex--;
+      gForward = false;
+    }
 
-  if (gCurrentTestIndex == -1) {
-    gBrowser.selectedBrowser.removeEventListener("load", checkResult, true);
-    gBrowser.removeCurrentTab();
-    finish();
-    return;
+    if (gCurrentTestIndex == -1) {
+      gBrowser.selectedBrowser.removeEventListener("load", checkResult, true);
+      gBrowser.removeCurrentTab();
+      finish();
+      return;
+    }
+
+    gCurrentTest = tests[gCurrentTestIndex];
+    gTestDesc = "#" + gCurrentTestIndex + " (" + gCurrentTest.name + ")";
+    if (!gForward)
+      gTestDesc += " (second time)";
+    if (gCurrentTest.isHTTPS) {
+      gCheckETLD = true;
+      Services.prefs.setIntPref("browser.identity.ssl_domain_display", 1);
+    }
+    content.location = gCurrentTest.location;
+  } else {
+    gCheckETLD = false;
+    gTestDesc = "#" + gCurrentTestIndex + " (" + gCurrentTest.name + " without eTLD in identity icon label)";
+    if (!gForward)
+      gTestDesc += " (second time)";
+    Services.prefs.clearUserPref("browser.identity.ssl_domain_display");
+    content.location.reload(true);
   }
-
-  gCurrentTest = tests[gCurrentTestIndex];
-  gTestDesc = "#" + gCurrentTestIndex + " (" + gCurrentTest.name + ")";
-  if (!gForward)
-    gTestDesc += " (second time)";
-  content.location = gCurrentTest.location;
 }
 
 function checkResult() {
-  if (gCurrentTest.isHTTPS) {
+  if (gCurrentTest.isHTTPS && Services.prefs.getIntPref("browser.identity.ssl_domain_display") == 1) {
     // Check that the effective host is displayed in the UI
     let label = document.getElementById("identity-icon-label");
     is(label.value, gCurrentTest.effectiveHost, "effective host is displayed in identity icon label for test " + gTestDesc);
   }
 
   // Sanity check other values, and the value of gIdentityHandler.getEffectiveHost()
   is(gIdentityHandler._lastLocation.host, gCurrentTest.host, "host matches for test " + gTestDesc);
   is(gIdentityHandler.getEffectiveHost(), gCurrentTest.effectiveHost, "effectiveHost matches for test " + gTestDesc);
--- a/browser/themes/winstripe/browser.css
+++ b/browser/themes/winstripe/browser.css
@@ -1338,19 +1338,16 @@ html|*.urlbar-input:-moz-lwtheme:-moz-pl
   margin-top: 0;
   margin-bottom: 0;
   color: GrayText;
 }
 
 /* identity box */
 
 #identity-box {
-  background-image: -moz-linear-gradient(hsl(0,0%,98%), hsl(0,0%,92%));
-  box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset;
-  -moz-border-end: 1px solid hsla(0,0%,0%,.1);
   padding: 2px;
 }
 
 #identity-box:-moz-locale-dir(ltr) {
   border-top-left-radius: 1.5px;
   border-bottom-left-radius: 1.5px;
 }
 
@@ -1388,70 +1385,29 @@ html|*.urlbar-input:-moz-lwtheme:-moz-pl
   padding-left: 5.01px;
 }
 
 @conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
   /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
   padding-right: 5.01px;
 }
 
-#identity-box:hover {
-  background-image: -moz-linear-gradient(hsl(0,0%,95%), hsl(0,0%,87%));
-}
-
-#identity-box[open="true"],
-#identity-box:hover:active {
-  background-image: -moz-linear-gradient(hsl(0,0%,92%), hsl(0,0%,82%));
-  box-shadow: 0 1px 1px hsla(0,0%,0%,.3) inset,
-              0 1px 3px hsla(0,0%,0%,.3) inset;
-}
-
-#identity-box.verifiedDomain {
-  background-image: -moz-linear-gradient(hsl(215,60%,92%), hsl(215,58%,88%));
-  box-shadow: 0 1px 0 hsla(215,54%,33%,.05) inset;
-  -moz-border-end-color: hsla(215,54%,33%,.2);
-  color: hsl(215,54%,33%);
-}
-
-#identity-box.verifiedDomain:hover {
-  background-image: -moz-linear-gradient(hsl(215,85%,85%), hsl(215,70%,68%));
-}
-
-#identity-box.verifiedDomain[open="true"],
-#identity-box.verifiedDomain:hover:active {
-  background-image: -moz-linear-gradient(hsl(215,80%,80%), hsl(215,67%,65%));
-  box-shadow: 0 1px 1px hsla(215,54%,33%,.7) inset,
-              0 1px 3px 1px hsla(215,54%,33%,.5) inset;
-}
-
 #identity-box.verifiedIdentity {
-  background-image: -moz-linear-gradient(hsl(91,70%,90%), hsl(93,60%,81%));
-  box-shadow: 0 1px 0 hsla(92,81%,16%,.05) inset;
-  -moz-border-end-color: hsla(92,81%,16%,.2);
+  background-color: #fff;
   color: hsl(92,100%,20%);
-}
-
-#identity-box.verifiedIdentity:hover {
-  background-image: -moz-linear-gradient(hsl(92,69%,77%), hsl(92,44%,51%));
-}
-
-#identity-box.verifiedIdentity[open="true"],
-#identity-box.verifiedIdentity:hover:active {
-  background-image: -moz-linear-gradient(hsl(92,65%,70%), hsl(92,40%,48%));
-  box-shadow: 0 1px 1px hsla(92,81%,16%,.6) inset,
-              0 1px 3px 1px hsla(92,81%,16%,.5) inset;
+  -moz-border-end: 1px solid hsla(92,81%,16%,.2);
 }
 
 #identity-box:-moz-focusring {
   outline: 1px dotted #000;
   outline-offset: -3px;
 }
 
 #identity-icon-labels {
-  -moz-margin-start: 1px;
+  -moz-margin-start: 5px;
   -moz-margin-end: 3px;
 }
 
 /* Location bar dropmarker */
 
 .urlbar-history-dropmarker {
   -moz-appearance: none;
   padding: 0 3px;
@@ -1477,21 +1433,39 @@ html|*.urlbar-input:-moz-lwtheme:-moz-pl
   -moz-image-region: rect(0px, 33px, 14px, 22px);
 }
 
 /* page proxy icon */
 
 #page-proxy-favicon {
   width: 16px;
   height: 16px;
-  margin: 1px 4px;
-}
-
-#page-proxy-favicon:not([src]) {
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  margin-top: 1px;
+  margin-bottom: 1px;
+  -moz-margin-start: 4px;
+  -moz-margin-end: 0;
+  list-style-image: url(chrome://browser/skin/identity-icons-generic.png);
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.verifiedDomain > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon {
+  list-style-image: url(chrome://browser/skin/identity-icons-https.png);
+}
+
+.verifiedIdentity > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon {
+  list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png);
+}
+
+#identity-box:hover > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+#identity-box:hover:active > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon,
+#identity-box[open=true] > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 #page-proxy-favicon[pageproxystate="invalid"] {
   opacity: 0.5;
 }
 
 /* autocomplete */
 
@@ -2185,17 +2159,17 @@ toolbarbutton.bookmark-item[dragover="tr
 }
 
 .identity-popup-label {
   white-space: pre-wrap;
   -moz-padding-start: 15px;
   margin: 0;
 }
 
-#identity-popup-content-host ,
+#identity-popup-content-host,
 #identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner {
   font-size: 1.2em;
 }
 
 #identity-popup-content-host {
   margin-top: 3px;
   margin-bottom: 5px;
   font-weight: bold;
new file mode 100644
index 0000000000000000000000000000000000000000..a39e493c1eb1eaacc6b40c32fb6eebe683021b3f
GIT binary patch
literal 965
zc$@*n13LVPP)<h;3K|Lk000e1NJLTq001xm000mO1ONa4`lmEH0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#XGugsR5;6()JurfWf;ft&;QKDGv}PS
zo|!R^V`}OcNl_L-yKvDWrOV2}Y$49HC{U=NpcV>6Ar%z3$&p%kgOCbJp+JHn5Nu_X
z_e-8^@;Eo0IWx|g^S&)+yo@V*S1&y8_xbU>JbV-PbS|f4v}@CV2}7<b7s9=e$<52R
zi@a)`WjO15JD<OFNBesBmDgO~e4{(Gks6wJs&RMbh=Ib??Khv?#lL=OPQW+olieNJ
zw6saheiz5}zHs1H`z3>KU3<B?u3o(<Sr@1@?a6=W!p(?}*C)FdXR~s~boxmg*ZanS
zTLEA9r1w3ZG&rLu%DbXgHO37u9^i6H*WkADrj_O?Dv6qms8QAOMSh!NA@EU8cHgr}
zqhn487P_cjCB_YJ9w5cRuDI*Tq)pl~Eh+{CwU#EK|6ms~<uxNOJ*ZKgf}E;hQH_F;
zjpa2m?C6TSo=XaHR-13ic|pC$lF+}Sixgo?Ypzjn&5s5IK`<sE8@8f-xGz_q6_x#F
zXtq8f5$cBfbP%@`a_xdaU%DWQqER(c*|>EkU|o}c{plCevv?5vW3{jr`N{6AAr~E2
zoyDVQP`Al$ZG?60&iU0>DtGW_JR_{7mat;LB@=U&D{Hw%p&JcTZG*13F{hrkP{veV
z198O#r(B;?Z}x<|*gZ2rWyH83NC_Hb1P_?6B2+*aHz|rzqO`QApjDMBgi6V%AgC2I
zX%;+ci7BBnGr>8lSgKjhNiB+k8Y4==Sxh9u)eaWO%J@r8Nl;_Vh-BErP5xmWS{>Et
zl%UoXmxQx30f($Act{G5IBp!rbQ<6=2GggmcjPUW!ZPPf;)GU18c!P}9<pkgr_|tS
zKf8_}EOws5Ghg&s7%M6Yg0xO)L1I)G51-;{TYsD?DG7o)E$Rh~iIuipuFmkMomN$q
zalf1(r8LW@*i;OCA^stVqJ^f-*KQ()-c3c6n~vo7Mi*!6?W)?en3CVqbVQl$#n>0)
z(b*kaZrT!ylw<7OUc9A>T|N5SvkO!WNJ*5&_4Vz)t%~B?rHxH>dBLER#Au~sZ`TL6
zRq<|*{)O44rkz(K@%OmC_x8_`-RFzEc1u>@+4;&{vKw7f+FV{a-Ae6n=48k2=DTF~
n&RzWbb7gnWy3U~de{}sH<r$SwqU;WP00000NkvXXu0mjfm%Y@7
new file mode 100644
index 0000000000000000000000000000000000000000..91c5dcb8830e76799d9371f183b4f07a03675dbf
GIT binary patch
literal 900
zc$@)*1AF|5P)<h;3K|Lk000e1NJLTq001xm000mO1^@s6P_F#30009^Nkl<Zc-pPi
zTS!z<6b4|M$xaA5nOYr!7|oo@@{(gp7jt4DyO0{BrV`S{BB+olqR2u_OHH8*C>2CR
zM8p&Y1<?g^6ng5VNQmgM*N`suwpu^@0~_bkL3;RLxAwncuQU4`Q$%FO?tE*Fa;a36
zrZSbSyegl(tYtEj%AS-s+-k1MP+640n%m6c4F6+*S;pbB)DpE)m8nW9V{HjC#t^g2
z1F_~&xyrAq$<LaHndAeUc)E6(3ad#9qn2O*7oSch4_GuZQQtf?9vmMS4g3PEQNtcH
zne1_yPo4){(K}vq;NXpt_bo%qrvPizu*Zx$;Q*m0<v#UYiHS8|oB?L5bhTKm8lI@z
z+dmrk+5fg$OsHWG8D`Vjn*tmtw<l85-ZHrS_nrZtm{9AD)Eq(v*@OdhJo1N?sOQQC
zt_6E$mRG=1*{VRTABb#zcj--)Tpru}>DJeVF2EW!>>-0Jdo1G`d6a+uNb&o|z5>}d
zTr_d@LwzS;jT-ilK{nw4#~+qWDp9skvswFLW_bnD_(V(9w%*rOQ$4RX3J$LS4guDv
z>E0h?m|e_X7uncr>MNLPxVTKNeXK`+6JU*+4iW9Q(Gz!oqxaVcIH~h4W~e;1K{a>3
z*dTy|n~Zuhvw7@wD~rEM+wKeb0_<z2kWp__KJ>&4aO7@jM9Duyi~&;Be7;;;x?gVk
za{k$RNd_5Y*)!kx@>H}A7Jl8;l`qL4gDiSt1~`1XM4T`Nu+#!otZF--t`jGaMGt!|
zm7{|7=az~S$f74^fP*)S#Q}4GxoQ!=^Se(!t`sMbWslAO!&cjC&*q5}$f74^fc+z@
z#ewMq*wFz_h1ZG$i3ZrQ^GvQdfo$9X+ODq>2c{3OFnWbT56Z;>^9n6Ae}V0%yy8IO
zUtsT*LUCaFJCMy6GT3q7FHRuKo^0bC2y8p)6(^95`wp}Y6-Jc&!`QU1&^+Z;<)Md_
zpN`%0OEQ|7K$bo8jIU7fuJZ+-w}!lu3^K@?U!fV}H$06`a48QKRCTIRwNN8#L1dWC
zVXs?R##IdPitI447BH@!^*;u1sW~d02lDc2lqkQdAU|r{^D>*xUKd%)!#z8J9A>QO
aU*f;6c*m;N5KuP&0000<MNUMnLSTZ>&#CGF
new file mode 100644
index 0000000000000000000000000000000000000000..3a22f7e0195088708f3838376551b95a42e87f7e
GIT binary patch
literal 553
zc%17D@N?(olHy`uVBq!ia0vp^20$#p!3HD)*8SPYz`*#y)5S5Q;?~t`2eYCaC0HLc
z-PU1>z01zAy|P(slgE6e^B45IPKJp9!AC|H7D1N@jy)P0N{?I|@1`d@dWh#Wr(7&4
zt*YD6y8FX^<L;D+N7*0GoS(>dNBcW-L;2gQd{#1i|Chd)<Md00bFq%-**&?9yLa#A
zHY(|nIBCPRMB~QWvisX^zdf9_wMuZ)G@ox8PqhNphUuTUV3?%xS?j|4@6J_9M_eOc
zXcV05u6w@pzs_{;Bc5v2M$Vqo`CoPlh^H>x?6Cg2F^g27!XncX7F;c}&ptaC)%~^V
zZ}$HC|3yGXrl_rSSQ=yqQ^GBg+{eO|6zQ-a-MvwN&x_MZ8yWQfHSf3Qiu69VcfZl(
zkOeV%@|+?^HZ?e$KgV=8Pu%J3SElq5<N4<mckElbe&X$jI_1r`ESCmxI-M5gF0qpJ
zF4*AJ=zs0j@tZkqDn`nim!H!R>z?)?;VRSHGHJUhOyQSbirA%myCT`@#AtVgX>Ay{
z+!m(mlTWgM1%KAa$$eoun<gxGh3WA}2_U&Mh7Tyx>&6UZFTThDByZ-30Y$!6$;w?R
zPq2_V)clJt#YnQ^0{4|HQ}2Qu*Z;NtsIli`V^(>1CjVUAJS*k7e$h>b|3=rInd`~9
oYf*OVo7hutvg^+5&Hm5ub=6M8`svs10+RrPr>mdKI;Vst0MAtN5&!@I
--- a/browser/themes/winstripe/jar.mn
+++ b/browser/themes/winstripe/jar.mn
@@ -20,16 +20,19 @@ browser.jar:
 *       skin/classic/browser/browser.css                             (browser.css)
 *       skin/classic/browser/engineManager.css                       (engineManager.css)
         skin/classic/browser/Geolocation-16.png
         skin/classic/browser/Geolocation-64.png
         skin/classic/browser/webapps-16.png
         skin/classic/browser/webapps-64.png
         skin/classic/browser/Info.png                                (Info.png)
         skin/classic/browser/identity.png                            (identity.png)
+        skin/classic/browser/identity-icons-generic.png
+        skin/classic/browser/identity-icons-https.png
+        skin/classic/browser/identity-icons-https-ev.png
         skin/classic/browser/keyhole-forward-mask.svg
         skin/classic/browser/KUI-background.png
         skin/classic/browser/KUI-close.png
         skin/classic/browser/pageInfo.css
         skin/classic/browser/pageInfo.png                            (pageInfo.png)
         skin/classic/browser/page-livemarks.png                      (feeds/feedIcon16.png)
         skin/classic/browser/livemark-folder.png                     (livemark-folder.png)
         skin/classic/browser/Privacy-16.png
@@ -200,16 +203,19 @@ browser.jar:
 *       skin/classic/aero/browser/browser.css                        (browser-aero.css)
 *       skin/classic/aero/browser/engineManager.css                  (engineManager.css)
         skin/classic/aero/browser/Geolocation-16.png
         skin/classic/aero/browser/Geolocation-64.png
         skin/classic/aero/browser/webapps-16.png
         skin/classic/aero/browser/webapps-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-icons-generic.png
+        skin/classic/aero/browser/identity-icons-https.png
+        skin/classic/aero/browser/identity-icons-https-ev.png
         skin/classic/aero/browser/keyhole-forward-mask.svg
         skin/classic/aero/browser/KUI-background.png
         skin/classic/aero/browser/KUI-close.png
         skin/classic/aero/browser/pageInfo.css
         skin/classic/aero/browser/pageInfo.png                       (pageInfo-aero.png)
         skin/classic/aero/browser/page-livemarks.png                 (feeds/feedIcon16-aero.png)
         skin/classic/aero/browser/livemark-folder.png                (livemark-folder-aero.png)
         skin/classic/aero/browser/Privacy-16.png                     (Privacy-16-aero.png)