Bug 1259573 - Invert the default favicon for selected awesomebar popup entries. r=mak
authorDrew Willcoxon <adw@mozilla.com>
Tue, 19 Apr 2016 09:31:35 -0700
changeset 331636 45f98cbddc015c5659abe141de0b8fa6bd534051
parent 331635 1531145c059ab57207ed343c882a02e1fae6ca7c
child 331637 3b3c1809c8be95512093a3cf19d1a35e99ad145c
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1259573
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1259573 - Invert the default favicon for selected awesomebar popup entries. r=mak MozReview-Commit-ID: 1UQPVyYueD0
toolkit/components/places/UnifiedComplete.js
toolkit/components/places/tests/unifiedcomplete/test_remotetabmatches.js
toolkit/themes/linux/global/autocomplete.css
toolkit/themes/linux/mozapps/jar.mn
toolkit/themes/linux/mozapps/places/defaultFavicon.png
toolkit/themes/osx/global/autocomplete.css
toolkit/themes/osx/mozapps/jar.mn
toolkit/themes/osx/mozapps/places/defaultFavicon.png
toolkit/themes/osx/mozapps/places/defaultFavicon@2x.png
toolkit/themes/shared/jar.inc.mn
toolkit/themes/shared/non-mac.jar.inc.mn
toolkit/themes/shared/places/defaultFavicon-inverted.png
toolkit/themes/shared/places/defaultFavicon-inverted@2x.png
toolkit/themes/shared/places/defaultFavicon.png
toolkit/themes/shared/places/defaultFavicon@2x.png
toolkit/themes/windows/global/autocomplete.css
toolkit/themes/windows/mozapps/jar.mn
toolkit/themes/windows/mozapps/places/defaultFavicon.png
toolkit/themes/windows/mozapps/places/defaultFavicon@2x.png
--- a/toolkit/components/places/UnifiedComplete.js
+++ b/toolkit/components/places/UnifiedComplete.js
@@ -1422,17 +1422,17 @@ Search.prototype = {
     if (Prefs.restyleSearches && match.style == "favicon") {
       this._maybeRestyleSearchMatch(match);
     }
 
     if (this._addingHeuristicFirstMatch) {
       match.style += " heuristic";
     }
 
-    match.icon = match.icon || PlacesUtils.favicons.defaultFavicon.spec;
+    match.icon = match.icon || "";
     match.finalCompleteValue = match.finalCompleteValue || "";
 
     this._result.insertMatchAt(this._getInsertIndexForMatch(match),
                                match.value,
                                match.comment,
                                match.icon,
                                match.style,
                                match.finalCompleteValue);
--- a/toolkit/components/places/tests/unifiedcomplete/test_remotetabmatches.js
+++ b/toolkit/components/places/tests/unifiedcomplete/test_remotetabmatches.js
@@ -137,17 +137,17 @@ add_task(function* test_noShowIcons() {
 
   yield check_autocomplete({
     search: "ex",
     searchParam: "enable-actions",
     matches: [ makeSearchMatch("ex", { heuristic: true }),
                makeRemoteTabMatch("http://example.com/", "My Phone",
                                   { title: "An Example",
                                     // expecting the default favicon due to that pref.
-                                    icon: PlacesUtils.favicons.defaultFavicon.spec,
+                                    icon: "",
                                   }),
              ],
   });
   Services.prefs.clearUserPref("services.sync.syncedTabs.showRemoteIcons");
 });
 
 add_task(function* test_matches_title() {
   // URL doesn't match search expression, should still match the title.
--- a/toolkit/themes/linux/global/autocomplete.css
+++ b/toolkit/themes/linux/global/autocomplete.css
@@ -126,16 +126,30 @@ treechildren.autocomplete-treebody::-moz
 
 .ac-site-icon {
   width: 16px;
   height: 16px;
   max-width: 16px;
   max-height: 16px;
   -moz-margin-start: 0;
   -moz-margin-end: 11px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+.ac-site-icon[selected] {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon-inverted.png");
+}
+
+@media (min-resolution: 1.1dppx) {
+  .ac-site-icon {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+  .ac-site-icon[selected] {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon-inverted@2x.png");
+  }
 }
 
 .ac-title {
   -moz-margin-start: 0;
   -moz-margin-end: 6px;
 }
 
 html|span.ac-tag {
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -24,18 +24,15 @@ toolkit.jar:
   skin/classic/mozapps/passwordmgr/key-16.png              (passwordmgr/key-16.png)
   skin/classic/mozapps/passwordmgr/key-64.png              (passwordmgr/key-64.png)
   skin/classic/mozapps/plugins/pluginGeneric.png           (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png           (plugins/pluginBlocked.png)
   skin/classic/mozapps/plugins/pluginGeneric-16.png        (plugins/pluginGeneric-16.png)
   skin/classic/mozapps/profile/profileicon.png             (profile/profileicon.png)
   skin/classic/mozapps/update/updates.css                  (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css           (viewsource/viewsource.css)
-#ifdef MOZ_PLACES
-  skin/classic/mozapps/places/defaultFavicon.png           (places/defaultFavicon.png)
-#endif
 
 #if MOZ_BUILD_APP == browser
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
 % override chrome://mozapps/skin/passwordmgr/key.png       chrome://mozapps/skin/passwordmgr/key-16.png
deleted file mode 100644
index ee65b2d494b867ba2e4b75f78bccff37942bd1d7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/osx/global/autocomplete.css
+++ b/toolkit/themes/osx/global/autocomplete.css
@@ -104,16 +104,30 @@ treechildren.autocomplete-treebody::-moz
 
 .ac-site-icon {
   width: 16px;
   height: 16px;
   max-width: 16px;
   max-height: 16px;
   -moz-margin-start: 0;
   -moz-margin-end: 11px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+.ac-site-icon[selected] {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon-inverted.png");
+}
+
+@media (min-resolution: 2dppx) {
+  .ac-site-icon {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+  .ac-site-icon[selected] {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon-inverted@2x.png");
+  }
 }
 
 .ac-title {
   -moz-margin-start: 0;
   -moz-margin-end: 6px;
 }
 
 html|span.ac-tag {
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -48,20 +48,16 @@ toolkit.jar:
   skin/classic/mozapps/plugins/pluginHelp-16.png                  (plugins/pluginHelp-16.png)
   skin/classic/mozapps/profile/profileicon.png                    (profile/profileicon.png)
   skin/classic/mozapps/profile/profileSelection.css               (profile/profileSelection.css)
   skin/classic/mozapps/profile/profileicon-selected.png           (profile/profileicon-selected.png)
   skin/classic/mozapps/update/buttons.png                         (update/buttons.png)
 * skin/classic/mozapps/update/updates.css                         (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css                  (viewsource/viewsource.css)
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (extensions/xpinstallConfirm.css)
-#ifdef MOZ_PLACES
-  skin/classic/mozapps/places/defaultFavicon.png                  (places/defaultFavicon.png)
-  skin/classic/mozapps/places/defaultFavicon@2x.png               (places/defaultFavicon@2x.png)
-#endif
   skin/classic/mozapps/handling/handling.css                      (handling/handling.css)
 
 #if MOZ_BUILD_APP == browser
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
 % override chrome://mozapps/skin/extensions/category-extensions.svg       chrome://mozapps/skin/extensions/extensionGeneric.svg
deleted file mode 100644
index ee65b2d494b867ba2e4b75f78bccff37942bd1d7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 51fc15219548bacdd6494362c46c19df92915b03..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -46,9 +46,15 @@ toolkit.jar:
   skin/classic/global/in-content/dropdown.svg              (../../shared/in-content/dropdown.svg)
   skin/classic/global/in-content/help-glyph.svg            (../../shared/in-content/help-glyph.svg)
   skin/classic/global/in-content/radio.svg                 (../../shared/in-content/radio.svg)
   skin/classic/global/reader/RM-Close-24x24.svg            (../../shared/reader/RM-Close-24x24.svg)
   skin/classic/global/reader/RM-Minus-24x24.svg            (../../shared/reader/RM-Minus-24x24.svg)
   skin/classic/global/reader/RM-Plus-24x24.svg             (../../shared/reader/RM-Plus-24x24.svg)
   skin/classic/global/reader/RM-Type-Controls-24x24.svg    (../../shared/reader/RM-Type-Controls-24x24.svg)
   skin/classic/global/reader/RM-Type-Controls-Arrow.svg    (../../shared/reader/RM-Type-Controls-Arrow.svg)
+#ifdef MOZ_PLACES
+  skin/classic/mozapps/places/defaultFavicon.png           (../../shared/places/defaultFavicon.png)
+  skin/classic/mozapps/places/defaultFavicon@2x.png        (../../shared/places/defaultFavicon@2x.png)
+  skin/classic/mozapps/places/defaultFavicon-inverted.png  (../../shared/places/defaultFavicon-inverted.png)
+  skin/classic/mozapps/places/defaultFavicon-inverted@2x.png (../../shared/places/defaultFavicon-inverted@2x.png)
+#endif
 
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -145,19 +145,16 @@
   skin/classic/mozapps/extensions/update.css                 (../../windows/mozapps/extensions/update.css)
   skin/classic/mozapps/extensions/discover-logo.png          (../../windows/mozapps/extensions/discover-logo.png)
   skin/classic/mozapps/extensions/experimentGeneric.png      (../../windows/mozapps/extensions/experimentGeneric.png)
   skin/classic/mozapps/extensions/rating-won.png             (../../windows/mozapps/extensions/rating-won.png)
   skin/classic/mozapps/extensions/rating-not-won.png         (../../windows/mozapps/extensions/rating-not-won.png)
   skin/classic/mozapps/extensions/cancel.png                 (../../windows/mozapps/extensions/cancel.png)
   skin/classic/mozapps/extensions/eula.css                   (../../windows/mozapps/extensions/eula.css)
   skin/classic/mozapps/handling/handling.css                 (../../windows/mozapps/handling/handling.css)
-#ifdef MOZ_PLACES
-  skin/classic/mozapps/places/defaultFavicon@2x.png          (../../windows/mozapps/places/defaultFavicon@2x.png)
-#endif
   skin/classic/mozapps/plugins/pluginBlocked-64.png          (../../windows/mozapps/plugins/pluginBlocked-64.png)
   skin/classic/mozapps/plugins/pluginHelp-16.png             (../../windows/mozapps/plugins/pluginHelp-16.png)
   skin/classic/mozapps/profile/profileSelection.css          (../../windows/mozapps/profile/profileSelection.css)
   skin/classic/mozapps/update/downloadButtons.png            (../../windows/mozapps/update/downloadButtons.png)
 * skin/classic/mozapps/xpinstall/xpinstallConfirm.css        (../../windows/mozapps/extensions/xpinstallConfirm.css)
 
 #if MOZ_BUILD_APP == browser
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..220cc1d1e5760e90b0769b1a96a01c3d42923115
GIT binary patch
literal 839
zc%17D@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F
z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a><YADU|@6%@Ck8czy{pi-LG7^
z^7-@UzkmM%$;+270|nQwU;pRNpMU@U-MxGF#*G_Cj~@N~`!`Vh|NsA=K7G1&?V7&6
zJ_`#=VPWCo#fyLa`sL;21ynzC=1jP;rlzKkA3yf>^#vOH=FJ<3;I3V}-oJnU_3Kxl
z)S*L%EG#S_;u;zn^XAPnGBN_PBO@bk-@XmB8pxKElmwEZqN1gxr6naLK=zq4XMh#~
z8U6kJKoaO+plRpMol8zm267)fc<}xEcc9*5$BxaOJsT+U<jIq1)20F44D^VTlaq~&
z&AN5#e*E|W^fJ(4lO|27sHgyPfhsp_*Z}n7$B!RRpFX{9+cu!5fEK|61n6-f`LJLE
zFu)lyOM?7@8Q5g?%vj|-7T)=FYp!DD=ilp>_Pm$*cWsfQWmx`uk1v^g9L&x;Jinb5
z7i~KKaA%i`5T`?q6Ql3SU*@*FHsN7X)4rLesNB9gBS2~MlRy30+`BSvu6A=Nf4Sg$
zYUC^Fs!vxZ*S`6Bcb;y54A(TErHo15?k)@+tg;?J4rhT!WHAE+w-5+3Ub<Tc3X*r8
zE{-7*my;71nB3IT#Kh9n!q_wtlAk|#^61gC#Pp^Ql|O&5vb47BWO4oBa`014(#%If
zlY%boG1^p<!^5+t=o2vh?r?Q^ozhzMC##3Y$L7_{nNnwFIc$x(WhLXobLP&js$Xnv
z3TNGp#mqUwqZ6aHY}TnX9yhn1XJRv_g*h;0OKWOI`&w7CA3x)xp1wd#Jlxj2T%6xu
zKVLrHJZ-^3u{ww3oqt7{eSDc3+cvE_$;Qg8%g1TT#XX%h>a@ZsaY0Uzj;_9s-K`d;
zdUlG&#)g`fs#Ep(9!aW|^_eh!eNa+nHlw`p-u9%E2}vv)8AB&2FHODv0hCS{JYD@<
J);T3K0RX0MY61WN
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b1b35718685e37b42b5a8de0840229cb991dc878
GIT binary patch
literal 1531
zc${rido<K}6#to~hi6O)g{8Hd5KG%*(PO4zG@=?6Q=2iBh%yyJO_by@lGh@yS<)a@
znLK*z2uV%e^2l3KGX@RQkVoUS*Ky9C{bPUUeDC+(&-Z@s{oH%M=NEp+o}ehVUJgMJ
z#r-yT671TGYt=H43Zu?3u%X?sc31={h?bwFE(crZv<=A)K^Q+HNMJC6NC65QL=gHf
z2r}$~Am&L3qIQwRJ#2{}DC0v1j#wf8_o30~q@<*_wl=X?ER{;<=jYqo+X0uAl`SnT
zot&Hm-ObHSB9Y9@%nS_;O;1k?g~Eh{1aO|6ot>JR0*9286gY*u`T6<T+1a_dxokFD
zRaLdSyL(|_!PV9E>C>m+nURsv)YLRQJWQw4m$K{X>Xw(6hlhuQZen7>=ktAhd?0K?
zL&L<xgocL3zdTDyN&sK%kD?+ZTB4z%q5?={WMqGTzeptN?d{FW%LByO*%_{vm6ZVw
zrlFzX`1p8dXJ>M9GSHZtn*)7xbaW}QKp?2Ct%cHno28{CjYb1dUtb>@0wB~C5)$&?
zj=8(L!_nB-SbTgum@O?WT3TA5@OV5Z4HPPs3T#tTQ^{oV(iI#I2lCmoXG<oB!vPr;
z6$Pw-4}=N}3j-t~A_4{hN^5KD$jAtkP*hX|5?XC$W>!&Ak(QQ5AP}OXqhn)Z3kwU2
zi;KBjE_4`35{X2JfA8MC^z?KHSXEU8g8&6afXCw@(b6bMBocHfD=Q01gC>WDhB`Vr
zLJH^!ICOM$Kxq(gk<9O5uVH)cL$Y^3l(Y@E?$G$no!vAd%~UlH{;Wl6lT>_p=_Vc*
z=y-@{{Vw~^EdQE6956^rdF!YwyPHW}kL4blxZAr6wN5^GQpS94xYR=7RB<)OSLNWx
zkfP1l?(B2IshkFbpSba_S@@%C_P(nebN*rZs+A6nU1!zPc5R7%gFbl6({6>D^^Z5!
zVy><}-80bPvVnSkS$b`sf4>OFJa2R63?m?D?yF6p*M+ti@Ae!**QZUkd6!-#QVx9h
z&d+T2<H$xs4Kk-}33!CLT+3$hVPCW%dn1TEW^u_h_g;rbg*v+*k3FK_=o<H(g2Afu
z!URrH34$6CQhY>Cp%(8zcCF4lfWCi6skzYXwvk0^A<33)WKlm_GMMcUu<+vST>*0-
z@q3;B9`OtDjOF;o_>&l-L0qjXi5N6bkvpDC@>I8G8<U!EqjFs7j4I>OsP_X7x0=w8
zbJW)*8j<B{?=DNa6RNrG#KWE0#pmDDjNK-t(%*YnI3)}yWN9i~Ev$LYBbWM~tY_?d
zl&6$*nOJwC99!ko^R7b=>y@uTc@iJ^z`3gNn%z*)_O9bQo=9-PwDEPUK3gTZKb<&_
z0zAVgb;2(S@wk|81UGZJ3+%0H|E}!z3ryo3r&lzr$|&&_S9{WFJ`^-pk4eJr2#rmf
zTge!I%-0!pw$dHa-Pt45x4>91j3_zNmo!^UtjrXh>{;KoFR)Gbd^8U!uny%buy$8U
zI`y|mJU@zbHiyN^ci5q>@U?N0es5vHul?G}rq})XD4bfifk$Pcb%3Oy;F8aGBKPR*
zPUCvhoBnZ*YqqtcbbY58m21a(AIqvITB}yrd30Tj(4-lb`bo3)<xF{b4r=#oilmY;
zqPknW;{2l3S)ZTB<PzA?>3U2feCvZoDV~~Mt~`t{OB~_sZN%6Hx%k<wz&H3D`&=@V
z+)fjnv%Mld!E6@eALcW}1pl}e)sRdV{ZB0I>93MFcc~D|2$~t2*l>l#nocGu_%Fm(
z&$sN^Aeuzt?iW%_1u}U|!*jM;A1pU}H=t^g^=@u&>EOgh_1!@Jus7)281=qhz;m&G
zdpTs^YXhNLmGYK4!_HT_nB6u;yMhW{sLaZTUYnTlntW-$_!HP~WslFtxdi<KBIorr
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ee65b2d494b867ba2e4b75f78bccff37942bd1d7
GIT binary patch
literal 979
zc${TXZA_Y16uz$2thQ#(HMWx4%%&mDG8?m2mo)oPJLE$FDKI9}l^0%>)`4|^PLMKI
zC{|(}5kyM`@okY09Z47Hk0vHGDNGmZqWCeFXbfxLwalejv!pee?X>>ePIAx9dCqg6
zbIv_oJT4<Ao05$X%3(2Se7JL8pSSmbKT-US0It3Aa!xrycfa4iEzN}ZeVobXAf%%r
zWHckR1(5M6LaikTr7?ug3?Ou<W$^y_PY}u&=COqpK=|i>wzRaQQmOcSK9k852m~69
z20(|yAruO&R;$@;b~>HlCnqO491fe!#&JBIPESls*zI;Mms?d;RaaM6Q&R(}#l=NX
zSYKb?Ri2)nRw|X;HwJ1hm#ezEdTws6t*y;svFvgpkqFcUWk~7udZ|>ZR;xuKk<aJz
zdcE!K?K~b2l$V#6#bPmw#gfbAfIvBq#{<vd75K`^O5n(3vhMC~2zPdNz(ZGnhr{7y
zGC4m#-_X!tv)KS72x4JjVSIcX1WhJWS6A1@#>ULd3@96oMkoZ$#N%<d+bw)!5{YDG
zWd#HSfdGTSfQdFYH-QYTYPH&3916iii9{kAjRFW+kcF@C`~5&5NfJhbkWQxqv$nR@
zU@!pqpGClSblaz3amcFSa|I}?@MKx$(Q|tD=%B8sp0M@zxy-?U+o10W2ED$~Pw(iY
z^;&Ph@3#kN9Rt_}^;p2~@Ld_|?C9}_z8wm=Mn>$i(8s|b(XWt{4u@==op<cFJ1@2n
z*KaDm^H@cp%RPY+;`3u2W6oyc_N|gDV-}_Q#<0_`E3Uuh`C-&+!n1i_R-aahlaHXQ
z3|SR}hOTE8G9lR4!W63!+MoCOWXvubwgG&_qLm8|CvgnDMW;6A=QmPCStl_3kJZPi
z6e*RP*0rx*X70UauAs$Vwm*2GPv!OUXFvLpP`%KfEgj3YR{s1!s3}dMxW4%9O!ooy
zece`;g`S{Lsl-Sl$v!ZZ?-VVRC8%dH#aHrQredkpr^iFh#BjKIZ7r21r(?%(#fM~3
z`q`5w&;I)TPx7bO+T|m;hYudfqmTth-z|tw#SRwczBfwb9eRFg?eRr>>|x9`aNMoH
zyuH0mgU*vf4<=%^n|*E^!)&+uC98vd`&3QR^Ix+riM16CpS2b}JXIQP{X6Fd=TUKK
j$@6<#(Spb~ntNA&MfGJRvzrcO1U><=D!8=pIqd4cD<s`8
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..51fc15219548bacdd6494362c46c19df92915b03
GIT binary patch
literal 2303
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
Z{{c+%BS@D78g&2w002ovPDHLkV1ke&VkrOs
--- a/toolkit/themes/windows/global/autocomplete.css
+++ b/toolkit/themes/windows/global/autocomplete.css
@@ -108,16 +108,30 @@ treechildren.autocomplete-treebody::-moz
 
 .ac-site-icon {
   width: 16px;
   height: 16px;
   max-width: 16px;
   max-height: 16px;
   -moz-margin-start: 0;
   -moz-margin-end: 11px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+.ac-site-icon[selected] {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon-inverted.png");
+}
+
+@media (min-resolution: 1.1dppx) {
+  .ac-site-icon {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+  .ac-site-icon[selected] {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon-inverted@2x.png");
+  }
 }
 
 .ac-title {
   -moz-margin-start: 0;
   -moz-margin-end: 6px;
 }
 
 html|span.ac-tag {
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -19,19 +19,16 @@ toolkit.jar:
   skin/classic/mozapps/extensions/dictionaryGeneric.png      (extensions/dictionaryGeneric.png)
   skin/classic/mozapps/extensions/dictionaryGeneric-16.png   (extensions/dictionaryGeneric-16.png)
   skin/classic/mozapps/extensions/localeGeneric.png          (extensions/localeGeneric.png)
   skin/classic/mozapps/extensions/heart.png                  (extensions/heart.png)
 * skin/classic/mozapps/extensions/newaddon.css               (extensions/newaddon.css)
   skin/classic/mozapps/passwordmgr/key.png                   (passwordmgr/key.png)
   skin/classic/mozapps/passwordmgr/key-16.png                (passwordmgr/key-16.png)
   skin/classic/mozapps/passwordmgr/key-64.png                (passwordmgr/key-64.png)
-#ifdef MOZ_PLACES
-  skin/classic/mozapps/places/defaultFavicon.png             (places/defaultFavicon.png)
-#endif
   skin/classic/mozapps/plugins/pluginGeneric.png             (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png             (plugins/pluginBlocked.png)
   skin/classic/mozapps/plugins/pluginGeneric-16.png          (plugins/pluginGeneric-16.png)
   skin/classic/mozapps/profile/profileicon.png               (profile/profileicon.png)
   skin/classic/mozapps/update/updates.css                    (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css             (viewsource/viewsource.css)
   skin/classic/mozapps/downloads/downloadButtons-XP.png      (downloads/downloadButtons-XP.png)
   skin/classic/mozapps/downloads/downloadIcon-XP.png         (downloads/downloadIcon-XP.png)
deleted file mode 100644
index ee65b2d494b867ba2e4b75f78bccff37942bd1d7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 51fc15219548bacdd6494362c46c19df92915b03..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001