Bug 968828 - [Australis] Sync Icon for the horizontal menu. r=Gijs, mikedeboer, a=sylvestre
authorJared Wein <jwein@mozilla.com>
Thu, 13 Feb 2014 15:45:00 +0000
changeset 182897 56b7db749e442def329d6772c0ea3228259ff469
parent 182896 c6c359ce5f0287737c0031239640c707fa736742
child 182898 b9922f325c5fc54272a4134d02d8eeef0657ea35
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, mikedeboer, sylvestre
bugs968828
milestone29.0a2
Bug 968828 - [Australis] Sync Icon for the horizontal menu. r=Gijs, mikedeboer, a=sylvestre
browser/base/content/browser-syncui.js
browser/themes/linux/jar.mn
browser/themes/linux/sync-horizontalbar.png
browser/themes/linux/syncProgress-horizontalbar.png
browser/themes/osx/browser.css
browser/themes/osx/customizableui/panelUIOverlay.css
browser/themes/osx/jar.mn
browser/themes/osx/sync-horizontalbar.png
browser/themes/osx/sync-horizontalbar@2x.png
browser/themes/osx/syncProgress-horizontalbar.png
browser/themes/osx/syncProgress-horizontalbar@2x.png
browser/themes/shared/customizableui/panelUIOverlay.inc.css
browser/themes/windows/jar.mn
browser/themes/windows/sync-horizontalbar-XPVista7.png
browser/themes/windows/sync-horizontalbar.png
browser/themes/windows/syncProgress-horizontalbar-XPVista7.png
browser/themes/windows/syncProgress-horizontalbar.png
--- a/browser/base/content/browser-syncui.js
+++ b/browser/base/content/browser-syncui.js
@@ -99,37 +99,42 @@ let gSyncUI = {
   updateUI: function SUI_updateUI() {
     let needsSetup = this._needsSetup();
     document.getElementById("sync-setup-state").hidden = !needsSetup;
     document.getElementById("sync-syncnow-state").hidden = needsSetup;
 
     if (!gBrowser)
       return;
 
-    let button = document.getElementById("sync-button");
-    if (!button)
-      return;
+    let syncButton = document.getElementById("sync-button");
+    let panelHorizontalButton = document.getElementById("PanelUI-fxa-status");
+    [syncButton, panelHorizontalButton].forEach(function(button)) {
+      if (!button)
+        return;
+      button.removeAttribute("status");
+    });
 
-    button.removeAttribute("status");
+    if (needsSetup && syncButton)
+      syncButton.removeAttribute("tooltiptext");
+
     this._updateLastSyncTime();
-    if (needsSetup)
-      button.removeAttribute("tooltiptext");
   },
 
 
   // Functions called by observers
   onActivityStart: function SUI_onActivityStart() {
     if (!gBrowser)
       return;
 
-    let button = document.getElementById("sync-button");
-    if (!button)
-      return;
-
-    button.setAttribute("status", "active");
+    ["sync-button", "PanelUI-fxa-status"].forEach(function(id) {
+      let button = document.getElementById(id);
+      if (!button)
+        return;
+      button.setAttribute("status", "active");
+    });
   },
 
   onSyncDelay: function SUI_onSyncDelay() {
     // basically, we want to just inform users that stuff is going to take a while
     let title = this._stringBundle.GetStringFromName("error.sync.no_node_found.title");
     let description = this._stringBundle.GetStringFromName("error.sync.no_node_found");
     let buttons = [new Weave.NotificationButton(
       this._stringBundle.GetStringFromName("error.sync.serverStatusButton.label"),
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -270,24 +270,26 @@ browser.jar:
   skin/classic/browser/devtools/app-manager/noise.png                 (../shared/devtools/app-manager/images/noise.png)
   skin/classic/browser/devtools/app-manager/default-app-icon.png      (../shared/devtools/app-manager/images/default-app-icon.png)
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-16.png
   skin/classic/browser/sync-32.png
   skin/classic/browser/sync-bg.png
   skin/classic/browser/sync-128.png
   skin/classic/browser/sync-desktopIcon.png
+  skin/classic/browser/sync-horizontalbar.png
   skin/classic/browser/sync-mobileIcon.png
   skin/classic/browser/sync-notification-24.png
   skin/classic/browser/syncProgress-menuPanel.png
   skin/classic/browser/syncProgress-toolbar.png
   skin/classic/browser/syncSetup.css
   skin/classic/browser/syncCommon.css
   skin/classic/browser/syncQuota.css
   skin/classic/browser/syncProgress.css
+  skin/classic/browser/syncProgress-horizontalbar.png
 #endif
   skin/classic/browser/notification-pluginNormal.png  (../shared/plugins/notification-pluginNormal.png)
   skin/classic/browser/notification-pluginAlert.png   (../shared/plugins/notification-pluginAlert.png)
   skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png)
   skin/classic/browser/devtools/tooltip/arrow-horizontal-dark.png   (../shared/devtools/tooltip/arrow-horizontal-dark.png)
   skin/classic/browser/devtools/tooltip/arrow-horizontal-dark@2x.png   (../shared/devtools/tooltip/arrow-horizontal-dark@2x.png)
   skin/classic/browser/devtools/tooltip/arrow-vertical-dark.png   (../shared/devtools/tooltip/arrow-vertical-dark.png)
   skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png   (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..824d4691b730247aa8258c963712e5fd8d385da7
GIT binary patch
literal 721
zc$@*z0xtcDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007*Nkl<ZILob5
zT}V@57?!AuKqP{wi=wUq=^~<wAaA=Xi#GqN{aHIZ+jQ>yZJq7>>}<~cxteoxS{Y(x
zmI)$BwF{%9B9V%s2+RlxO6saan3}%5$8ruy>Y@)GzK`#HpXdGFpRcIsf34%Eh*GWI
zk~(p^;i1vSzOSuweZ~C?-i@Md{a*zDU`undBg4v35W=k>MbqH+$3Y1vhS9c8qcb0<
zFp%#wIzszLfeJlosptKm#M>d*a%l-}|2fEXUI`(w*ktFX7%2=SBQ9!nM9r$_n|BbD
zHz!8YD9{1krX)y_)Qsb-ANmG{4jW1O5XlI0Vk8AZs1*pOXBs(M^8z|cLqvVLN_Hu6
zxYjptd*Z`nu(qC?8F@0g9aGpf`s_uT^F?yL=5|nhPZEw;UcgF;<3cC}BBCkY_6iC6
z5hdB-k#^iS{I1cqMBC;2o?sGGUmGn=tOzhd&KJu7=Ziwu)tljh!tN|gwfp)ln#DS(
zzE)PA%Ns~Wo|EyC7DEtCWDIL{Di}*vIfW3&zXay<2HG3=q!tcy1dEfuP)I7TH0)bG
zn;otmR*o$dneqfauPDb`hgc~Jo?r`DDDUjiYExOhy*gs7yxO??SWT_g%7_c94~HU+
zv1B$c@ciX#O&urY_`rEkh4dC`w!F%uMWGTsNzY^3rmU>E=u(=Og4j9v$MAzkhQcW<
zzR^F}gN8-g8v@eFe|!9N>|l+_#?^BQxRn_2I8<r?hdTi2i(OgdY+gOed-@0O^g3M9
z$2V`sgEX(~HIdA;T6Hf*^)x1c5hKvq-Fp{(%hvi2rHC_#O-7QU?2IsJXT_Y2k-^SN
z3pQH#PB>imj#L^p{>$f5hsliK5k7>3U=f<-;ZoO6Ib)Jd1?UgR00000NkvXXu0mjf
D80%GX
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a318003646593dc6e5334d126050dd3a52c68b49
GIT binary patch
literal 535
zc$@(j0_gpTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005rNkl<ZILob*
z%S!@L6vhukMNn#5mQfTX6lQ`8qnxw{G@1{{O^Y7;APm~qBB)L4YEiq|wC>L^8;cyw
z6dk9BO;S)n*@JFJ(U~y{Tr}|GKECgs``yc2fdBf&Gag&@rC}dZ?Ey%&^1wAeAon;v
zr8AzYvWj$ETUH^dC2}fx!(L7syL0=1Yvs)8VgIj-JFogzAkj#E(syH9^kjS*Na}>b
z+?Vl&S}Kh%c#RO(z9K{d<6}z;UaLLroW=f&OnY((lX|g0Eoa(<SOY22&RbT-Z@s+`
z)84xUpDO1WNxK|4elB`yIODby;i83wsG8)7cODj}ZP$)zdD7}c@3!c>Xo*NlMDqfX
zdXmG$+voqfWa^5ZDf*DCq_FB&gyb0D>AAlO3|?ZQf)9C<l(3G4GZo2m-m_b>EAMbh
zN%aS!FRVM49l@{#r%F;FJIK*fqIRZZMtHZiJ3iz`?NjtcdUiz5Xv(99km?CSb)>+X
zK4$fgrMz0~zr%_84%;u8{!Veu{?flNI<N@Gicf?9qe<J7uC^-Hw4NXTpn~n&`1O*y
zqSOK~O$?QoFe6q7Djy+OOXT3<wX)uYGHhOkU~>opc(ee<57d3Yky-$z<ItXPEB@^j
Ze*@rf20A8`Ri^*|002ovPDHLkV1kt={Tu)Q
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -1164,16 +1164,17 @@ toolbar .toolbarbutton-1:not([type="menu
     -moz-image-region: rect(0px, 160px, 32px, 128px);
   }
 
   #zoom-controls@inAnyPanel@ > #zoom-in-button,
   toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
     -moz-image-region: rect(0px, 192px, 32px, 160px);
   }
 
+  #PanelUI-fxa-status > .toolbarbutton-icon,
   #PanelUI-quit > .toolbarbutton-icon,
   #PanelUI-customize > .toolbarbutton-icon,
   #PanelUI-help > .toolbarbutton-icon {
     width: 16px;
   }
 }
 
 toolbar .toolbarbutton-1:not([type="menu-button"]),
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -6,32 +6,41 @@
 
 @media (min-resolution: 2dppx) {
   toolbarbutton.panel-multiview-anchor {
     background-image: url(chrome://browser/skin/customizableui/subView-arrow-back-inverted@2x.png),
                       linear-gradient(rgba(255,255,255,0.3), rgba(255,255,255,0));
     background-size: 16px, auto;
   }
 
+  #PanelUI-fxa-status {
+    list-style-image: url(chrome://browser/skin/sync-horizontalbar@2x.png);
+  }
+
+  #PanelUI-fxa-status[status="active"] {
+    list-style-image: url(chrome://browser/skin/syncProgress-horizontalbar@2x.png);
+  }
+
   #PanelUI-customize {
     list-style-image: url(chrome://browser/skin/menuPanel-customize@2x.png);
   }
 
   #PanelUI-help {
     list-style-image: url(chrome://browser/skin/menuPanel-help@2x.png);
   }
 
   #main-window[customize-entered] #PanelUI-customize {
     list-style-image: url(chrome://browser/skin/customizableui/menuPanel-customizeFinish@2x.png);
   }
 
   #PanelUI-quit {
     list-style-image: url(chrome://browser/skin/menuPanel-exit@2x.png);
   }
 
+  #PanelUI-fxa-status,
   #PanelUI-customize,
   #PanelUI-help,
   #PanelUI-quit {
     -moz-image-region: rect(0, 32px, 32px, 0);
   }
 
   #PanelUI-customize:hover,
   #PanelUI-help:not([disabled]):hover,
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -381,22 +381,26 @@ browser.jar:
   skin/classic/browser/devtools/app-manager/default-app-icon.png      (../shared/devtools/app-manager/images/default-app-icon.png)
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-throbber.png
   skin/classic/browser/sync-16.png
   skin/classic/browser/sync-32.png
   skin/classic/browser/sync-bg.png
   skin/classic/browser/sync-128.png
   skin/classic/browser/sync-desktopIcon.png
+  skin/classic/browser/sync-horizontalbar.png
+  skin/classic/browser/sync-horizontalbar@2x.png
   skin/classic/browser/sync-mobileIcon.png
   skin/classic/browser/sync-notification-24.png
   skin/classic/browser/syncSetup.css
   skin/classic/browser/syncCommon.css
   skin/classic/browser/syncQuota.css
   skin/classic/browser/syncProgress.css
+  skin/classic/browser/syncProgress-horizontalbar.png
+  skin/classic/browser/syncProgress-horizontalbar@2x.png
 #endif
   skin/classic/browser/lion/keyhole-circle.png              (keyhole-circle-lion.png)
   skin/classic/browser/keyhole-circle@2x.png                (keyhole-circle-lion@2x.png)
   skin/classic/browser/Toolbar-background-noise.png         (Toolbar-background-noise.png)
   skin/classic/browser/lion/toolbarbutton-dropmarker.png    (toolbarbutton-dropmarker-lion.png)
   skin/classic/browser/toolbarbutton-dropmarker@2x.png      (toolbarbutton-dropmarker-lion@2x.png)
   skin/classic/browser/lion/tabbrowser/alltabs-box-bkgnd-icon.png      (tabbrowser/alltabs-box-bkgnd-icon-lion.png)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon@2x.png        (tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png)
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4223d3bcbd4250689036879c75d2ab6ef10059bd
GIT binary patch
literal 707
zc$@*l0zCbRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007tNkl<ZILob5
zOK1~O6fL3)p%f8B7mBWg;zGoQV7KnvHIO!KKK-U?(lp<hN%NabGRaJ)Gl@xyRcPJR
z)JmmPD`*!+;=&rF1+xl%2qI|Fm6k%<+FtJ~W(dWi3m+WbF!$c`?z!*0hKB#OIt`{~
zy|HVor_Wp%wAnw{?2d1^e>Ir8ix@lnR{{VyksTYq8D=9O2qGkt5^&KNh)L-g#twDp
zO;?cY9g=DONPt1JZ^RFZl7ehD3z<w7c%Fx;sXGaysk_lSWM2z~S#W#2yLv-c`~LRN
zxZIv9IW?6^fhb}JlC<IX`(a_>;dP7EcFp6Zwj@acK}>?v<zB~{lPZDPGAObUZm&2N
zi^1I7gT+dv!VeESHeN0-pGFDiR#sNWqtR$pmK7km{R0+BC2+aDZv{M6OeP_nPM5IY
zGNLJ;e?Ecxk>4{qH8F83pGYKt<hni7dzAp&tB%Sta2yA@nHiyOuxIO~&d%O<u{dOs
z>qSXwz)MkE<YyR%bR&~B9&}TqvZ4)zLVE-hO>e7#U@-KVw8e2zGN9Y_McVd`OSSJ|
zr!yD9E=g`65d5Mh$x7;RBocu*>ciXEY}0kN)M99^*GO_+*P+*-)E$yTq{@o2q!PR-
zm0D?<sm9}RAQ}fO)=ezZAW@TL(7Nq#y4SFHmvl%7XomS&D7-M%yRdP7em=)A%x*Xw
zCT98ms#v_*)7$T5d?OG=NAi3e$N|I~lao_RSaW>8l`lM6T)fBle4onYGVc!rE?R9v
z>nuu32m+AnV_6oar|&+&+?IphLo=cmaSYw(q$v6$P198bV0SwdMg4F%T~D=bx}*Q{
pxQLnh5IzKp2q8R()|$D<`USkrm9@JQ6Nvx-002ovPDHLkV1nf`Mq2;?
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fdc126681a8a11340d65676b5cc627d72f4efa55
GIT binary patch
literal 1145
zc$@)w1cv*GP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg000C)Nkl<Zcmbu8
zOKenC7{`C-+}CiYw=->r0qOK5jA^4{gCdYhM3$IhQ@|>Og*<dYVsv8+!pa!J1``vB
z!3PUdYG_h|SOpO(qX;C8h=`$0W0k_lV=PRe59W2uWbQl&bj9zV{O?_S_nY%S^L>Jc
zMDmd6l(1$N3weUM%wZ;eG$73=F*b00+6HTI3Gt@bC@Li;209u7P$U@dEq<PqWTuO7
znRh;F2)|!O1GR*h<4UJ>u+!T~CrN*DKN03m6JdWji@sZTr=tc3K~?~1yvf#c<KysJ
zne5Y=1*v|unqw5u1vxs#^q{pqAj{Dxa+}H#?->BO%WAGi@~?laH@$-6_eD@k)fbMe
z0#u2{2wY+aI-W8&%%vQMI{cRGQS<T@(tYvhpZm=@c-)SP7z)VXy|^#64}F)Tc`-4t
zsm1Hl_M+W$0=eD_*I*$~DE?zaRs1=kCdgp_VPn&{+jl*RLLu<*DCTqG6+u=q_b}g{
zUHJ7FlgSsm-s*nl=nXRX27LI~Ubg+y>VZoDNIcBK*rr4w0t@t}3M2|ek_ol4YuO+d
zI!@M{&k!085rW8!=$39@^ePI4MgXHxEH0ctZ?iDS5vA#umI1ox=IEwF&eiaZFku*G
zk9DE-o4e#Nn1TM1j*iTl-Qsi8r;y3^2wyP>obvv<rIQJAr08z$_g#*=H{r)#YGWg_
zrax|@vf?Jep^D@DMUJnlhe(kpP46SaaktV&Hc2EhYszPmW1OlHekM<nPD+Uy!)bC@
z;4h4_loAC%hRNv1Q}>MGJ=`75xRnYm4Ini%tf_oo$(8aeOs{B-Mve^Dl!b-NniHFJ
zllh1(iczYI!HeWIWZqm>;Z{!ITz7DgS*sq%UyX-!b-XQ3QDQAia1pOlWfr&Op8x@5
z)|yVMLWFX(U8z8dygYUC6JZDh;z?~sfMSHkQ;jqtv(|FLj^+Q~DvSnsNCgx*ISY;X
zVw*rct9@^mmAl(IiFIrFkIPw(%$hd1Br--0gL=%x@+>c-0i>F$G2T<3X(!8O*PxRl
z#$)I7fx;wmb!DG_B)@GI4fsRyL%g6jXDS_PHSfldUW4h*YaHWF+Yv^9{Q8T?`UB!_
z%v}`&)PkKocX|+;EeyQW;lpy*EkT^;56?V>DmH-g^L}5|l}N;ZBrz7A+-hL7*BP6F
zXqeb|&;Xd^8uKHqXE+U|4HP{s18cubPer*#^NBZp;M>&+ZMR_>C_uQEcbn17;v<{;
zIE*{5LQ$ZewZp-#72&}({rtqSRa>nO!gvrAxxxzv+kYd%ak#$$gjmN6-~@f`oAo_j
zDk;MR1Q{}<NN_7vzmshg5IZR4T|X-rq#xkmhS67}wejGTqlA)LQcGGB=J?o!Xn$fa
zf8!$BcrXW^rj-YgqL;H!8euwSGmlz=I0z&OQj9Y}oSU5G7B2q-&qB2gKrr<C00000
LNkvXXu0mjf>GB>7
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a1a1ac394c743c790b65f83412e730d1860a1433
GIT binary patch
literal 537
zc$@(l0_OdRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005tNkl<ZILob*
z-Aj{E9LG-~-Wdc&5rQ`oQP`G?S)hhOsG-#~y9jy_>}4v5_vI3nx`b&3+P0<+H|C^T
zDT-JA2VN*$SeN2W3JX%w8T#q>ROjhY6uj_(FXuex`*P0topY2rsIO@PXWb}?@?mC5
zBP^B-@?DU+GR)^E(`4=|<ZcpgVHm8aNibq?kH@Jf8DgRSBko<zcRt{`5Q3e!pQO2U
zilZ09Ed3kXx|gJ7o4Ij<)8~V%+XA3b5F%x?55{mvNUiW|nv?#@!!dHrfNODrXZk?n
z)+nBaPn<dzAk{d|5kn)hUe51lRcpi(HUsPd=JQ^IfuaE>_4w^~xU4I^8YQfCwtl{t
zMD8no=DY+0QnZG>iY%v8qjlm*o5YD8){ptY!1Xvc_X=>0;L^I|eoH`3FY{U5V8Hp7
zh}Co>PO0uo0pDw#c)pq<F@=;53}n0@T^Xg?TwO1-)o~nhx!i|+Y-*jH($N3n#N<di
zSy3HA{zbZY5O-~YZ0T<t>S9^iEepR<5yif3f0qVmR$iIGD}qkGRmM0ev-tk}?|?ms
zf7c>8Lp&1mY*~b}0*7knhk7O^3v6%b+Sj|t@8hX@&Ybed*4kwGZTymeB`M%!RgA0y
bd&R#2lVxxKnsuOZ00000NkvXXu0mjf(zXED
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b21bb54d0154426f10dd81076495603a9a9cbc80
GIT binary patch
literal 1027
zc$@(P1pNDnP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000BZNkl<ZSi|jC
zX-HI26n<8eC`pAGB^a1(T2{1J<dzm%xsWXqtwtI|N!hO`ODS{9vK%c($6ZS+wIC}Z
zh_oLS(MCTCECdZKBP<+HoW8yZ$ENr0dya!YeeiLad(ZjKx#!$-?j1=Q{Zzihdzcx2
z2XVXVacR?aG;FL!%eqRuUsH}YqJ02uoO{Q$<|FsvF*1gmFekPS<pCw=US$Am!G<a{
zi?~ic!dSZ<IYH$;4M<x_14Ci|Z6sLhG8%4-%EPr4czvh|i|le>UnAm3{&Ph!pankz
zjK?0p$)cC^0F#5u@WHZf=3pvghh=<sJ(89c!9-vvgjV30wQfWW>g6)ai_psrZMDgG
zTqB~F>e07E57>guwJ=z8nTkN_nnZGR<X6HSEY>uB@GhJgwzfrufUVeZ3r8*b0i}4Z
zCCl|!baI@k1F<)dyzmO30TWB_p)W_v+};L+TcvIbH_)oZvHd2JR2^XWTD=PZ5vXkB
zZugqyVrr3Xndgq?SaUGU&Vi+Ptj0qdpE){+4qnK-d_aWx`7rIg_5Vo@D#JbVTKsJ|
z%efd8N9O#!8Xs+KR5-x8Et;(ZL|9*iGPyi=>cYeIK`okeICMCC(z0Sa^~?k0@Y2D^
zFi#a3VWaZYI@COPZ$+GR{Dnf8o_+DS1jxY}eq?Vq<vn2#an8!acZDz)dfamXIl?M&
z*<J^j)?^VUVNwWB&xO(LA|OXt71Hf>AiN4GB2L=sRS3_xh)&lWKn}lR)Y|L7iXz+;
zane?oLYR4Z?s6WGgTn1vMz+<7-vN9>I8MEQE)l2MmO{b56gtOjKm?{CLCpd7gUrYp
zWnBlCBTbEu-BMYG5!DD8mkEe4B?leR*Wj+wJ<F$Ez(+n}CRpa8YT)mfg&s9N_JJrR
zQwAIuo=+Sh0>k;1J9QUSPqTTQ<*GOTCVANSEaq5+$0-{f>>uKn5^t*{DV>5UAaN%j
z8;3Vk|GUw+qi+N2Ciap>j{RC3Y|(}4C+Zv=CgtD_N2nqLU-<@bHH)vUM3APeQnxGe
z8r(EXhavQp((p?<O9dr<`<LLrVC7s!or;_gs|`rBseXe>5krL@=?oREz+16ou*p=y
zn{&N#88s{@K=H7e2+zZMDt1e$BuM>hTtB#&3Wtf=XtAsffqvhs$g-=G@%7`wa%$$S
zmSR26-RPtglG^~5>G2W$$Hd(vOQ%V0D^k$AxNwA>;9&}yt3&RXOgv$TJET+SBl-!m
xQ6r81VER7s<iBL9n!NI$=ehD3{lhEz{s6f>CU!QQ;|c%(002ovPDHLkV1m-O;h+Ej
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -394,16 +394,27 @@ toolbarpaletteitem[place="palette"] > to
   -moz-margin-end: 0;
 }
 
 #PanelUI-fxa-status,
 #PanelUI-customize {
   flex: 1;
   -moz-padding-start: 15px;
   -moz-border-start-style: none;
+}
+
+#PanelUI-fxa-status {
+  list-style-image: url(chrome://browser/skin/sync-horizontalbar.png);
+}
+
+#PanelUI-fxa-status[status="active"] {
+  list-style-image: url(chrome://browser/skin/syncProgress-horizontalbar.png);
+}
+
+#PanelUI-customize {
   list-style-image: url(chrome://browser/skin/menuPanel-customize.png);
 }
 
 #customization-panelHolder #PanelUI-customize {
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-customizeFinish.png);
 }
 
 #PanelUI-help {
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -299,22 +299,26 @@ browser.jar:
         skin/classic/browser/devtools/app-manager/default-app-icon.png      (../shared/devtools/app-manager/images/default-app-icon.png)
 #ifdef MOZ_SERVICES_SYNC
         skin/classic/browser/sync-throbber.png
         skin/classic/browser/sync-16.png
         skin/classic/browser/sync-32.png
         skin/classic/browser/sync-128.png
         skin/classic/browser/sync-bg.png
         skin/classic/browser/sync-desktopIcon.png
+        skin/classic/browser/sync-horizontalbar.png
+        skin/classic/browser/sync-horizontalbar-XPVista7.png
         skin/classic/browser/sync-mobileIcon.png
         skin/classic/browser/sync-notification-24.png
         skin/classic/browser/syncSetup.css
         skin/classic/browser/syncCommon.css
         skin/classic/browser/syncQuota.css
         skin/classic/browser/syncProgress.css
+        skin/classic/browser/syncProgress-horizontalbar.png
+        skin/classic/browser/syncProgress-horizontalbar-XPVista7.png
 #endif
         skin/classic/browser/devtools/tooltip/arrow-horizontal-dark.png   (../shared/devtools/tooltip/arrow-horizontal-dark.png)
         skin/classic/browser/devtools/tooltip/arrow-horizontal-dark@2x.png   (../shared/devtools/tooltip/arrow-horizontal-dark@2x.png)
         skin/classic/browser/devtools/tooltip/arrow-vertical-dark.png   (../shared/devtools/tooltip/arrow-vertical-dark.png)
         skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png   (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
         skin/classic/browser/devtools/tooltip/arrow-horizontal-light.png   (../shared/devtools/tooltip/arrow-horizontal-light.png)
         skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png   (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
         skin/classic/browser/devtools/tooltip/arrow-vertical-light.png   (../shared/devtools/tooltip/arrow-vertical-light.png)
@@ -614,24 +618,31 @@ browser.jar:
 
 #ifdef MOZ_SERVICES_SYNC
         skin/classic/aero/browser/sync-throbber.png
         skin/classic/aero/browser/sync-16.png
         skin/classic/aero/browser/sync-32.png
         skin/classic/aero/browser/sync-128.png
         skin/classic/aero/browser/sync-bg.png
         skin/classic/aero/browser/sync-desktopIcon.png
+        skin/classic/aero/browser/sync-horizontalbar.png
+        skin/classic/aero/browser/sync-horizontalbar-XPVista7.png
         skin/classic/aero/browser/sync-mobileIcon.png
         skin/classic/aero/browser/sync-notification-24.png
         skin/classic/aero/browser/syncSetup.css
         skin/classic/aero/browser/syncCommon.css
         skin/classic/aero/browser/syncQuota.css
         skin/classic/aero/browser/syncProgress.css
+        skin/classic/aero/browser/syncProgress-horizontalbar.png
+        skin/classic/aero/browser/syncProgress-horizontalbar-XPVista7.png
 #endif
 #endif
         skin/classic/aero/browser/devtools/tooltip/arrow-horizontal-dark.png   (../shared/devtools/tooltip/arrow-horizontal-dark.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-horizontal-dark@2x.png   (../shared/devtools/tooltip/arrow-horizontal-dark@2x.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-vertical-dark.png   (../shared/devtools/tooltip/arrow-vertical-dark.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-vertical-dark@2x.png   (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-horizontal-light.png   (../shared/devtools/tooltip/arrow-horizontal-light.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-horizontal-light@2x.png   (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-vertical-light.png   (../shared/devtools/tooltip/arrow-vertical-light.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-vertical-light@2x.png   (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
+
+% override chrome://browser/skin/sync-horizontalbar.png          chrome://browser/skin/sync-horizontalbar-XPVista7.png          os=WINNT osversion<6.2
+% override chrome://browser/skin/syncProgress-horizontalbar.png  chrome://browser/skin/syncProgress-horizontalbar-XPVista7.png  os=WINNT osversion<6.2
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..824d4691b730247aa8258c963712e5fd8d385da7
GIT binary patch
literal 721
zc$@*z0xtcDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007*Nkl<ZILob5
zT}V@57?!AuKqP{wi=wUq=^~<wAaA=Xi#GqN{aHIZ+jQ>yZJq7>>}<~cxteoxS{Y(x
zmI)$BwF{%9B9V%s2+RlxO6saan3}%5$8ruy>Y@)GzK`#HpXdGFpRcIsf34%Eh*GWI
zk~(p^;i1vSzOSuweZ~C?-i@Md{a*zDU`undBg4v35W=k>MbqH+$3Y1vhS9c8qcb0<
zFp%#wIzszLfeJlosptKm#M>d*a%l-}|2fEXUI`(w*ktFX7%2=SBQ9!nM9r$_n|BbD
zHz!8YD9{1krX)y_)Qsb-ANmG{4jW1O5XlI0Vk8AZs1*pOXBs(M^8z|cLqvVLN_Hu6
zxYjptd*Z`nu(qC?8F@0g9aGpf`s_uT^F?yL=5|nhPZEw;UcgF;<3cC}BBCkY_6iC6
z5hdB-k#^iS{I1cqMBC;2o?sGGUmGn=tOzhd&KJu7=Ziwu)tljh!tN|gwfp)ln#DS(
zzE)PA%Ns~Wo|EyC7DEtCWDIL{Di}*vIfW3&zXay<2HG3=q!tcy1dEfuP)I7TH0)bG
zn;otmR*o$dneqfauPDb`hgc~Jo?r`DDDUjiYExOhy*gs7yxO??SWT_g%7_c94~HU+
zv1B$c@ciX#O&urY_`rEkh4dC`w!F%uMWGTsNzY^3rmU>E=u(=Og4j9v$MAzkhQcW<
zzR^F}gN8-g8v@eFe|!9N>|l+_#?^BQxRn_2I8<r?hdTi2i(OgdY+gOed-@0O^g3M9
z$2V`sgEX(~HIdA;T6Hf*^)x1c5hKvq-Fp{(%hvi2rHC_#O-7QU?2IsJXT_Y2k-^SN
z3pQH#PB>imj#L^p{>$f5hsliK5k7>3U=f<-;ZoO6Ib)Jd1?UgR00000NkvXXu0mjf
D80%GX
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..38755cea435c9a7abc6086c756c27eb2db15d8ad
GIT binary patch
literal 546
zc$@(u0^R+IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005$Nkl<ZIE}4P
zyG|QH6s1U$D56P0lSnBdOX;AZKqBM^A|VTjAAlwT?BMm<cxHD!GyAgFHqRvV{0Idg
z8boSDg-GEP7%AZ;<jJ`!Y`hYdTrkqn?#w;s+;i{H&~qKr@;(9^MJL#0vU<u?^atN2
z-VT8m1DTX$<*SM|wcq%zgVmqft!-(hs_RtCTkg1Ndnfp&pA_f0JMZ`n9W;LE5MqK0
zGbEZp?R801&gpJ>^)~La39-S|JMKnT)S2McHnoa2n&og+qif3G?v(A<|9SPTxQ<jU
zXhwPs$`HgwSzXr{WxgcBw?H$`)vI_s5st#}l1wDH(5SA#iU^M$x{~`&_q`lUCUzu3
zMGc4x&2hJY_<!l~A@Y}gOU42}5r??YT=yDWQFkY3=p2)u`xz`VIY}JiLUWTCK~&aa
z1CT1cqHNI_>-^`K+NK1=#h!jWM&n92eq9R`G52-0;7oLC--^y2?kOM*?|Vs&z=bAw
zjJ6_1u%K2M2?z#LHyP7T1H&-9E!f^~eA}HmjBcU%keJV4at0>%mK$jZ&awsj4UnOG
zM@XF^MgwU)xujf4OauGC`=vZjfp}qiwOB~ts;W({mijF@aTX0e2ZIBoX%!v64ctL|
ko-wVRg&cc1kjWtDKPi1mt7$!e<^TWy07*qoM6N<$f>_V^YXATM
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a318003646593dc6e5334d126050dd3a52c68b49
GIT binary patch
literal 535
zc$@(j0_gpTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005rNkl<ZILob*
z%S!@L6vhukMNn#5mQfTX6lQ`8qnxw{G@1{{O^Y7;APm~qBB)L4YEiq|wC>L^8;cyw
z6dk9BO;S)n*@JFJ(U~y{Tr}|GKECgs``yc2fdBf&Gag&@rC}dZ?Ey%&^1wAeAon;v
zr8AzYvWj$ETUH^dC2}fx!(L7syL0=1Yvs)8VgIj-JFogzAkj#E(syH9^kjS*Na}>b
z+?Vl&S}Kh%c#RO(z9K{d<6}z;UaLLroW=f&OnY((lX|g0Eoa(<SOY22&RbT-Z@s+`
z)84xUpDO1WNxK|4elB`yIODby;i83wsG8)7cODj}ZP$)zdD7}c@3!c>Xo*NlMDqfX
zdXmG$+voqfWa^5ZDf*DCq_FB&gyb0D>AAlO3|?ZQf)9C<l(3G4GZo2m-m_b>EAMbh
zN%aS!FRVM49l@{#r%F;FJIK*fqIRZZMtHZiJ3iz`?NjtcdUiz5Xv(99km?CSb)>+X
zK4$fgrMz0~zr%_84%;u8{!Veu{?flNI<N@Gicf?9qe<J7uC^-Hw4NXTpn~n&`1O*y
zqSOK~O$?QoFe6q7Djy+OOXT3<wX)uYGHhOkU~>opc(ee<57d3Yky-$z<ItXPEB@^j
Ze*@rf20A8`Ri^*|002ovPDHLkV1kt={Tu)Q
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..025293f75185d955a5f40afc4fd8c41ec416c223
GIT binary patch
literal 370
zc$@)p0ge8NP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003wNkl<Zc-p1V
zJxc;m6vpvWxfIdT;8M^KLR(D@fz=lXLWI6RE)BH=y_04yG}hGa7ip+y5hWr*BtkT@
zA%pTI!qfl46%L}4!w>G|Jon+=EB&YMJ+Yf9T;dvee4vbb1iBZTyjg3|HWv`gB8P~{
zQ*c~ri9tJvVi-jznplB2GLS4f<ETQ7G87>!;K$4=2tuUqsNlq*Mhs&pV+ew2e3?uV
zJR$Mwq@i94;)Nkb(&RFrApYWfL%k(P7xN}p1AlOscdAft5z<B2<m#Z{Am^l^-Z{jW
zG3zUn%YrBDKRXGiSHm2{yFmyM{F&StxWV3&6GR2-)e*r68YrP@<_%1Og5AfKDE^=*
zU=$nB4mKg6VCTVF#w{ig!Y8!Nx;-O-?QA!zxI+a^{Gx~y1|i@Rw=zBX2hR4&U5*c<
Q_W%F@07*qoM6N<$f&yEeH~;_u