Merge pull request #51 from whuhacker/master

Merry Xmas
uku · Dec 3, 2012 · bb7a0af · bb7a0af
2 parents f91a790 + 35ee809
commit bb7a0af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/chrome/config.js b/chrome/config.js
@@ -188,7 +188,7 @@ chrome.storage.onChanged.addListener(function(changes, area) {
  if (typeof support_change.newValue !== 'undefined' && support_change.newValue === 'yes') {
  chrome.browserAction.setIcon({path: 'chrome/icons/icon19heart.png'});
  } else {
- chrome.browserAction.setIcon({path: 'chrome/icons/icon19.png'}); 
+ chrome.browserAction.setIcon({path: 'chrome/icons/icon19xmas.png'}); 
  }
  }
 });
@@ -208,7 +208,7 @@ document.addEventListener("DOMContentLoaded", function() {
  chrome.browserAction.setIcon({path: 'chrome/icons/icon19heart.png'});
  } else {
  _gaq.push(['_trackEvent', 'Init Support', 'No']);
- chrome.browserAction.setIcon({path: 'chrome/icons/icon19.png'});
+ chrome.browserAction.setIcon({path: 'chrome/icons/icon19xmas.png'});
  }
  });
  });

diff --git a/chrome/icons/icon19xmas.png b/chrome/icons/icon19xmas.png
diff --git a/manifest.json b/manifest.json
@@ -32,7 +32,7 @@
  },
  "browser_action": {
  "default_title": "Unblock Youku",
- "default_icon": "chrome/icons/icon19.png",
+ "default_icon": "chrome/icons/icon19xmas.png",
  "default_popup": "chrome/pages/popup.html"
  },
  "options_page": "chrome/pages/options.html",