Some cleanup of the extensions context menu API.

This CL contains the following:
-Use lower case names for enum values in the create/update properties (eg 'page' instead of 'PAGE')
-Make the top-level API name plural (contextMenus instead of contextMenu)
-Don't fire onclick handlers for a parent menu item when one of its children is clicked on.
-Remove the enabledContexts property for now, to eventually be replaced with a way to programmatically enable/disable.

There are a few more things in the bug that I'll be doing in subsequent CL's.

BUG=48198
TEST=Extensions using the context menu API should work with the changes described above.


Review URL: http://codereview.chromium.org/2887013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51970 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 10 deletions

diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
index 4a59dcb..4ebc848 100644
--- a/chrome/renderer/resources/extension_process_bindings.js
+++ b/chrome/renderer/resources/extension_process_bindings.js
@@ -263,7 +263,7 @@ var chrome = chrome || {};
   }
 
   function setupHiddenContextMenuEvent(extensionId) {
-    var eventName = "contextMenu/" + extensionId;
+    var eventName = "contextMenus/" + extensionId;
     chromeHidden.contextMenuEvent = new chrome.Event(eventName);
     chromeHidden.contextMenuHandlers = {};
     chromeHidden.contextMenuEvent.addListener(function() {
@@ -272,12 +272,6 @@ var chrome = chrome || {};
       if (onclick) {
         onclick.apply(onclick, arguments);
       }
-
-      var parentMenuItemId = arguments[0].parentMenuItemId;
-      var parentOnclick = chromeHidden.contextMenuHandlers[parentMenuItemId];
-      if (parentOnclick) {
-        parentOnclick.apply(parentOnclick, arguments);
-      }
     });
   }
 
@@ -597,7 +591,7 @@ var chrome = chrome || {};
           details, this.name, this.definition.parameters, "page action");
     };
 
-    apiFunctions["experimental.contextMenu.create"].customCallback =
+    apiFunctions["experimental.contextMenus.create"].customCallback =
         function(name, request, response) {
       if (chrome.extension.lastError || !response) {
         return;
@@ -611,7 +605,7 @@ var chrome = chrome || {};
       }
     };
 
-    apiFunctions["experimental.contextMenu.remove"].customCallback =
+    apiFunctions["experimental.contextMenus.remove"].customCallback =
         function(name, request, response) {
       // Remove any onclick handler we had registered for this menu item.
       if (request.args.length > 0) {
diff --git a/chrome/renderer/resources/renderer_extension_bindings.js b/chrome/renderer/resources/renderer_extension_bindings.js
index f274be7..e2e0e1d 100644
--- a/chrome/renderer/resources/renderer_extension_bindings.js
+++ b/chrome/renderer/resources/renderer_extension_bindings.js
@@ -247,7 +247,7 @@ var chrome = chrome || {};
       "experimental.accessibility",
       "experimental.bookmarkManager",
       "experimental.clipboard",
-      "experimental.contextMenu",
+      "experimental.contextMenus",
       "experimental.cookies",
       "experimental.extension",
       "experimental.idle",