Relocated icon and redesigned icon popup

chrome/background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 199 matching lines @@
       chrome.browserAction.setTitle({tabId: this._tabId, title: title});
     },
     hide: function()
     {
       chrome.browserAction.hide(this._tabId);
     },
     show: function()
     {
       chrome.browserAction.show(this._tabId);
     },
-    setBadgeBackgroundColor: function(color)
-    {
-      chrome.browserAction.setBadgeBackgroundColor({tabId: this._tabId, color: color});
-    },
-    setBadgeNumber: function(number)
-    {
-      chrome.browserAction.setBadgeText({
-        tabId: this._tabId,
-        text: (number === null) ? "" : number.toString()
-      });
+    setBadge: function(badge)
+    {
+      if (!badge)
+      {
+        chrome.browserAction.setBadgeText({
+          tabId: this._tabId,
+          text: ""
+        });
+        return;
+      }
+      
+      if ("color" in badge)
+      {
+        chrome.browserAction.setBadgeBackgroundColor({
+          tabId: this._tabId,
+          color: badge.color
+        });
+      }
+  
+      if ("number" in badge)
+      {
+        chrome.browserAction.setBadgeText({
+          tabId: this._tabId,
+          text: badge.number.toString()
+        });
+      }
     }
   };
 
   Tab = function(tab)
   {
     this._id = tab.id;
 
     this.url = tab.url;
     this.browserAction = new BrowserAction(tab.id);
 
@@ skipping 115 matching lines @@
     onCompleted: new CompletedTabEventTarget(),
     onActivated: new ActivatedTabEventTarget(),
     onRemoved: new RemovedTabEventTarget()
   };
 
   ext.webRequest = {
     onBeforeRequest: new BeforeRequestEventTarget(),
     handlerBehaviorChanged: chrome.webRequest.handlerBehaviorChanged
   };
 })();