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 92 matching lines @@
   var index = url.indexOf("#");
   if (index >= 0)
     url = url.substring(0, index);
 
   var result = defaultMatcher.matchesAny(url, type || "DOCUMENT", extractHostFromURL(parentUrl || url), false);
   return (result instanceof WhitelistFilter ? result : null);
 }
 
 var activeNotification = null;
 
-// Adds or removes page action icon according to options.
+// Adds or removes browser action icon according to options.
 function refreshIconAndContextMenu(tab)
 {
   if(!/^https?:/.test(tab.url))
     return;
 
   var iconFilename;
   if (require("info").platform == "safari")
     // There is no grayscale version of the icon for whitelisted tabs
     // when using Safari, because icons are grayscale already and icons
     // aren't per tab in Safari.
     iconFilename = "icons/abp-16.png"
   else
   {
     var excluded = isWhitelisted(tab.url);
     iconFilename = excluded ? "icons/abp-19-whitelisted.png" : "icons/abp-19.png";
   }
 
-  tab.pageAction.setIcon(iconFilename);
-  tab.pageAction.setTitle(ext.i18n.getMessage("name"));
+  tab.browserAction.setIcon(iconFilename);
+  tab.browserAction.setTitle(ext.i18n.getMessage("name"));
 
   iconAnimation.registerTab(tab, iconFilename);
 
   if (localStorage.shouldShowIcon == "false")
-    tab.pageAction.hide();
+    tab.browserAction.hide();
   else
-    tab.pageAction.show();
+    tab.browserAction.show();
 
   if (require("info").platform == "chromium") // TODO: Implement context menus for Safari
     // Set context menu status according to whether current tab has whitelisted domain
     if (excluded)
       chrome.contextMenus.removeAll();
     else
       showContextMenu();
 }
 
 /**
@@ skipping 447 matching lines @@
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);