summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/resources
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 03:53:00 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 03:53:00 +0000
commit917defe16badc44a0d24348739a1657d6c13aca5 (patch)
tree4aecf9a612aff48274a8df392ff037015c0ff3e9 /chrome/renderer/resources
parentcf9a246cf386c7af0fb6524ac5d025c0d4e8563a (diff)
downloadchromium_src-917defe16badc44a0d24348739a1657d6c13aca5.zip
chromium_src-917defe16badc44a0d24348739a1657d6c13aca5.tar.gz
chromium_src-917defe16badc44a0d24348739a1657d6c13aca5.tar.bz2
Reverting 20714.
Rietveld showed all green try bots, but looks like one ui test is failing Review URL: http://codereview.chromium.org/149668 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/resources')
-rw-r--r--chrome/renderer/resources/extension_process_bindings.js16
1 files changed, 3 insertions, 13 deletions
diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
index e0dba27..1c8fc9c4 100644
--- a/chrome/renderer/resources/extension_process_bindings.js
+++ b/chrome/renderer/resources/extension_process_bindings.js
@@ -30,7 +30,6 @@ var chrome = chrome || {};
native function GetTabLanguage();
native function EnablePageAction();
native function DisablePageAction();
- native function GetCurrentPageActions();
native function GetBookmarks();
native function GetBookmarkChildren();
native function GetBookmarkTree();
@@ -398,16 +397,9 @@ var chrome = chrome || {};
}
];
- // Page action events send (pageActionId, {tabId, tabUrl}).
- function setupPageActionEvents(extensionId) {
- var pageActions = GetCurrentPageActions();
- var eventName = "";
- for (var i = 0; i < pageActions.length; ++i) {
- eventName = extensionId + "/" + pageActions[i];
- // Setup events for each extension_id/page_action_id string we find.
- chrome.pageActions[pageActions[i]] = new chrome.Event(eventName);
- }
- }
+ // Sends ({pageActionId, tabId, tabUrl}).
+ chrome.pageActions.onExecute =
+ new chrome.Event("page-action-executed");
//----------------------------------------------------------------------------
// Bookmarks
@@ -556,8 +548,6 @@ var chrome = chrome || {};
// TODO(mpcomplete): self.onConnect is deprecated. Remove it at 1.0.
// http://code.google.com/p/chromium/issues/detail?id=16356
chrome.self.onConnect = new chrome.Event("channel-connect:" + extensionId);
-
- setupPageActionEvents(extensionId);
});
chrome.self.getViews = function() {