From cd06755a3e0cc893fb72b9e7f51cce874857c2e1 Mon Sep 17 00:00:00 2001
From: Will Bamberg <wbamberg@mozilla.com>
Date: Tue, 19 Jan 2016 16:22:27 -0800
Subject: [PATCH] Add 48px icon in 'icons' key

---
 chill-out/button/LICENSE                         |   1 -
 chill-out/icons/LICENSE                          |   3 +++
 .../chillout.png => icons/chillout-32.png}       | Bin
 chill-out/icons/chillout-48.png                  | Bin 0 -> 1261 bytes
 chill-out/manifest.json                          |  10 +++++++++-
 5 files changed, 12 insertions(+), 2 deletions(-)
 delete mode 100644 chill-out/button/LICENSE
 create mode 100644 chill-out/icons/LICENSE
 rename chill-out/{button/chillout.png => icons/chillout-32.png} (100%)
 create mode 100644 chill-out/icons/chillout-48.png

diff --git a/chill-out/button/LICENSE b/chill-out/button/LICENSE
deleted file mode 100644
index 50b37ce..0000000
--- a/chill-out/button/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-The icon "chillout.png" is taken from the IconBeast Lite iconset, and used under the terms of its license (http://www.iconbeast.com/faq/), with a link back to the website: http://www.iconbeast.com/free/.
diff --git a/chill-out/icons/LICENSE b/chill-out/icons/LICENSE
new file mode 100644
index 0000000..2294057
--- /dev/null
+++ b/chill-out/icons/LICENSE
@@ -0,0 +1,3 @@
+The icon "chillout-32.png" is taken from the IconBeast Lite iconset, and used under the terms of its license (http://www.iconbeast.com/faq/), with a link back to the website: http://www.iconbeast.com/free/.
+
+The icon "chillout-48.png" is taken from Aha-Soft’s Free Retina iconset, and used under the terms of its license (http://www.aha-soft.com/free-icons/free-retina-icon-set/), with a link back to the website: http://www.aha-soft.com/.
diff --git a/chill-out/button/chillout.png b/chill-out/icons/chillout-32.png
similarity index 100%
rename from chill-out/button/chillout.png
rename to chill-out/icons/chillout-32.png
diff --git a/chill-out/icons/chillout-48.png b/chill-out/icons/chillout-48.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc456e51f78fa978bc22a0a100760a0c80c4f330
GIT binary patch
literal 1261
zcmV<J1QPp+P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T7000EENkl<Zc-qyN
zYlu}<6vx-SGmS<;8Y)%>24PGeCQ(cgD#|Yk<tRlyu#(6?a?D61{ZOWrM%qh!L{#)p
zlX57fNHi52%}0HRA}v(VUOpPj5|eT6z5V~JwYj_PKF51#oI7s#anHGDKmKR!wbxmD
z=cJ35T(t#c71#|d2H$|!t1T`jZ~=G%%mA-cTU;pcCh!&b1q=blt1T`R_y%|o%mYtV
zTUaQt5BL^z2RDjZu}c&ua0J*Sx-cHDl9nsMDbN-ZI3BD5kAUT!C~6T{D(deW!F^zV
zOyF413?2h7cak_7Wi^-!TEP-f5B9|b4g_C=Pr&F-5XXqI8T0^0!6l+od<WPDO1{9H
zRoDY=0Jqrng(`Vbf4?1^wXxex$FmYd5I@X3DmuM8MHkKK3nY-j)`3gC@$>e30^9|5
z#02&P+eQ6grKrP}q+?4z8{=9~l=2K76b*A@L_f2)g1<t6EcAg-MZd}KfT<m9$yY&>
zl&9AHF1Ke}KwmHtY={YD;dl5YyZ#K!2E9Ok>#P9&7Ikh0^uyqv3dC{X-Qa4w&wI}p
z|60w$HKGyao+N=RbHFq9{0yiy{BqX#9UKr14?ln(?LXJ9Hy8jKMSZ&%h%0&b1-qvK
zhOw`-e2|vpclk2w)cIr1`^_i3<QcOnEq=N8e=(tc!Qitx@H4m>{FWw=gYN=^t#OSf
z%wIeu?*&Sp@Vwm@ymmDSWBEE-MBS<-d=M5+#|9gu#v44Xb0@fxIyujxbc@Y49zPcC
zNe%rnS2Sq0nc4j*{=ebJSvzmy7(ISHpJ~IwjJnC*rnZ9ml?ro~D_XyMOyH@k0_g|O
zNjX-Pq+>Q&&ic-;w~EHSwpit~0VjjE<iAtw*LU|>r`xr2FaAE5m{d8J@;_6swboJ6
z6sK9Wlu$nuI1{{>RUpe0@S1f*3&vttXu*P<yO?6(#noXzX6kh)tH3M3=TeS=`AB_V
zSW%K=oO|vEc(?GL1oKncB?^38G#z)-TZ*)C7INXD)n1C9JBAFV@!W(>5?uuC_7d(>
z$M7-~oXjeajn{)wL8s0Si-ABErc2Dk_eT0-`;Wk#_QLKfLxICgVB$iH38cSq1H;U^
z;C1*DI40$3ck!&&th6%45DlX7&b?&2jl)p3FslVw-V_ZpZh^cFX4(CB;3^x$`6jdE
z7D*2|eCZM1m~2m1;3D}mtH251J-gm#7H}W^yTJ!`%^1m0G0Fs_37jUnbNkrt8*K)r
zi*7wL3FInfCc`}LLvU~KywN(n#zZk2o+0UFkoC!AfT=x`SDpcVX_k#9y=iff0rUmY
zRY`vg50kDFJq;Tt>YE(wa7ur5CW<>pZkVnIUx;Sw?4voWK$oI(gY&%Tv0SXIF$=#7
z?mv$e8M+w49uVF0G@13kH!B{=B9MiF^l8z>!BYoL_tBsZcZ1x!Fazc$Yeh<b?hI(J
z)n^97UEXlfRnB;MB8xzlt>8Ah<`LaPkvjBM?#Q?yS|;iqF`wdYk<&_d;FNN~HJD`?
zf+kDgCY1=}@dW*a0rd~j4N<J{*p9)P{>TW>mQb(W>a|)u?qBGi3_HcJ@<n%u-sQ@_
X9nvW{NM)?d00000NkvXXu0mjf_V!o9

literal 0
HcmV?d00001

diff --git a/chill-out/manifest.json b/chill-out/manifest.json
index 5acdae1..ff9cd30 100644
--- a/chill-out/manifest.json
+++ b/chill-out/manifest.json
@@ -1,4 +1,12 @@
 {
+  "manifest_version": 2,
+  "name": "Chill out",
+  "version": "1.0",
+  "description": "Show a page action after a period of inactivity. Show cat gifs when the page action is clicked.",
+  "homepage_url": "https://github.com/mdn/webextensions-examples/tree/master/chill-out",
+  "icons": {
+    "48": "icons/chillout-48.png"
+  },
 
   "manifest_version": 2,
   "name": "chillout-page-action",
@@ -16,7 +24,7 @@
   ],  
 
   "page_action": {
-    "default_icon": "button/chillout.png",
+    "default_icon": "icons/chillout-32.png",
     "default_title": "Chill out"
   },