Fixed regression: Context menu clickhide broken

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 122 matching lines @@
   tab.pageAction.setIcon(iconFilename);
   tab.pageAction.setTitle(ext.i18n.getMessage("name"));
 
   iconAnimation.registerTab(tab, iconFilename);
 
   if (localStorage.shouldShowIcon == "false")
     tab.pageAction.hide();
   else
     tab.pageAction.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();
+  if (excluded)
+    ext.contextMenus.removeAll();
+  else
+    showContextMenu();
 }
 
 /**
  * Old versions for Opera stored patterns.ini in the localStorage object, this
  * will import it into FilterStorage properly.
  */
 function importOldData()
 {
   if ("patterns.ini" in localStorage)
   {
@@ skipping 96 matching lines @@
     }, false);
     request.send(null);
   }
   else
     notifyUser();
 }
 
 // Set up context menu for user selection of elements to block
 function showContextMenu()
 {
-  chrome.contextMenus.removeAll(function()
+  ext.contextMenus.removeAll(function()
   {
     if(typeof localStorage["shouldShowBlockElementMenu"] == "string" && localStorage["shouldShowBlockElementMenu"] == "true")
     {
-      chrome.contextMenus.create({"title": chrome.i18n.getMessage("block_element"), "contexts": ["image", "video", "audio"], "onclick": function(info, tab)
+      ext.contextMenus.create(ext.i18n.getMessage("block_element"), ["image", "video", "audio"], function(srcUrl, tab)
       {
-        if(info.srcUrl)
-            chrome.tabs.sendRequest(tab.id, {reqtype: "clickhide-new-filter", filter: info.srcUrl});
-      }});
+        if (srcUrl)
+          tab.sendMessage({type: "clickhide-new-filter", filter: srcUrl});
+      });
     }
   });
 }
 
 /**
   * Opens options tab or focuses an existing one, within the last focused window.
   * @param {Function} callback  function to be called with the
                                 Tab object of the options tab
   */
 function openOptions(callback)
@@ skipping 174 matching lines @@
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);