New event style for pageAction API.

This makes us fire both the old deprecated style of pageActions click handler and the new pageAction style. 

BUG=25833
TEST=none


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

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

1 files changed, 6 insertions, 2 deletions

diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
index 7b76c48..dc4044b 100644
--- a/chrome/renderer/resources/extension_process_bindings.js
+++ b/chrome/renderer/resources/extension_process_bindings.js
@@ -192,12 +192,16 @@ var chrome = chrome || {};
   // Page action events send (pageActionId, {tabId, tabUrl}).
   function setupPageActionEvents(extensionId) {
     var pageActions = GetCurrentPageActions(extensionId);
-    var eventName = "pageAction/" + extensionId;
+
+    var oldStyleEventName = "pageActions/" + extensionId;
     // TODO(EXTENSIONS_DEPRECATED): only one page action
     for (var i = 0; i < pageActions.length; ++i) {
       // Setup events for each extension_id/page_action_id string we find.
-      chrome.pageActions[pageActions[i]] = new chrome.Event(eventName);
+      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);
   }