Relocated icon and redesigned icon popup

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 105 matching lines @@
   // The tab could have been closed by the time this function is called
   if(!tab)
     return;
 
   var excluded = isWhitelisted(tab.url);
   var iconFilename = excluded ? "icons/abp-19-whitelisted.png" : "icons/abp-19.png";
 
   if (activeNotification)
     startIconAnimation(tab, iconFilename);
   else
-    chrome.pageAction.setIcon({tabId: tab.id, path: iconFilename});
+    chrome.browserAction.setIcon({tabId: tab.id, path: iconFilename});
 
   // Only show icon for pages we can influence (http: and https:)
   if(/^https?:/.test(tab.url))
   {
-    chrome.pageAction.setTitle({tabId: tab.id, title: "Adblock Plus"});
+    chrome.browserAction.setTitle({tabId: tab.id, title: "Adblock Plus"});
     if ("shouldShowIcon" in localStorage && localStorage["shouldShowIcon"] == "false")
-      chrome.pageAction.hide(tab.id);
+      chrome.browserAction.hide(tab.id);
     else
-      chrome.pageAction.show(tab.id);
+      chrome.browserAction.show(tab.id);
 
     // Set context menu status according to whether current tab has whitelisted domain
     if (excluded)
       chrome.contextMenus.removeAll();
     else
       showContextMenu();
   }
 }
 
 /**
@@ skipping 390 matching lines @@
 
     function animationStep()
     {
       var opacity = frameOpacities[currentFrame];
       context.clearRect(0, 0, canvas.width, canvas.height);
       context.globalAlpha = 1;
       context.drawImage(icon, 0, 0);
       context.globalAlpha = opacity;
       context.drawImage(notificationIcon, 0, 0);
       var imageData = context.getImageData(0, 0, canvas.width, canvas.height);
-      chrome.pageAction.setIcon({tabId: tab.id, imageData: imageData});
+      chrome.browserAction.setIcon({tabId: tab.id, imageData: imageData});
 
       var interval;
       currentFrame++;
       if (currentFrame < frameOpacities.length)
       {
         var duration = 3000;
         interval = duration / frameOpacities.length;
       }
       else
       {
@@ skipping 191 matching lines @@
     tabs.forEach(refreshIconAndContextMenu);
   });
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);