Add support for omnibox.onInputStarted and onInputCancelled.

Also fix a bug where we'd keep an extension's old keyword even if it changed
on upgrade/reload.

BUG=46475
BUG=48091

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

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

1 files changed, 2 insertions, 18 deletions

diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
index c408f8e..4a59dcb 100644
--- a/chrome/renderer/resources/extension_process_bindings.js
+++ b/chrome/renderer/resources/extension_process_bindings.js
@@ -246,18 +246,6 @@ var chrome = chrome || {};
       // Setup events for each extension_id/page_action_id string we find.
       chrome.pageActions[pageActions[i]] = new chrome.Event(oldStyleEventName);
     }
-
-    // Note this is singular.
-    var eventName = "pageAction/" + extensionId;
-    chrome.pageAction = chrome.pageAction || {};
-    chrome.pageAction.onClicked = new chrome.Event(eventName);
-  }
-
-  // Browser action events send {windowpId}.
-  function setupBrowserActionEvent(extensionId) {
-    var eventName = "browserAction/" + extensionId;
-    chrome.browserAction = chrome.browserAction || {};
-    chrome.browserAction.onClicked = new chrome.Event(eventName);
   }
 
   function setupToolstripEvents(renderViewId) {
@@ -294,11 +282,6 @@ var chrome = chrome || {};
   }
 
   function setupOmniboxEvents(extensionId) {
-    chrome.experimental.omnibox.onInputEntered =
-        new chrome.Event("experimental.omnibox.onInputEntered/" + extensionId);
-
-    chrome.experimental.omnibox.onInputChanged =
-        new chrome.Event("experimental.omnibox.onInputChanged/" + extensionId);
     chrome.experimental.omnibox.onInputChanged.dispatch =
         function(text, requestId) {
       var suggestCallback = function(suggestions) {
@@ -394,6 +377,8 @@ var chrome = chrome || {};
             return;
 
           var eventName = apiDef.namespace + "." + eventDef.name;
+          if (eventDef.perExtensionEvent)
+            eventName = eventName + "/" + extensionId;
           module[eventDef.name] = new chrome.Event(eventName,
               eventDef.parameters);
         });
@@ -671,7 +656,6 @@ var chrome = chrome || {};
       chrome.test.getApiDefinitions = GetExtensionAPIDefinition;
     }
 
-    setupBrowserActionEvent(extensionId);
     setupPageActionEvents(extensionId);
     setupToolstripEvents(GetRenderViewId());
     setupPopupEvents(GetRenderViewId());