diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 06:59:22 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 06:59:22 +0000 |
| commit | 80d6a44253e9e28bbb06a384d6249f1623e8b1e4 (patch) | |
| tree | a581b4528f323ea84b5c8b5b6a92bc767096efa1 /chrome/renderer | |
| parent | 83fe23a3ff26c5dea371ce94f6a909c4d081b145 (diff) | |
| download | chromium_src-80d6a44253e9e28bbb06a384d6249f1623e8b1e4.zip chromium_src-80d6a44253e9e28bbb06a384d6249f1623e8b1e4.tar.gz chromium_src-80d6a44253e9e28bbb06a384d6249f1623e8b1e4.tar.bz2 | |
Reland r29095 (removes wrench integration for
browser actions).
Test failure was a fluke. I forgot that changing
resources always makes the first bot run fail.
TBR=mpcomplete@chromium.org
BUG=24379,24671
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/resources/extension_process_bindings.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js index c0e94a1..2941644 100644 --- a/chrome/renderer/resources/extension_process_bindings.js +++ b/chrome/renderer/resources/extension_process_bindings.js @@ -202,12 +202,12 @@ var chrome = chrome || {}; 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); - } + // 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) { chrome.toolstrip = chrome.toolstrip || {}; @@ -349,6 +349,7 @@ var chrome = chrome || {}; throw new Error( "The imageData property must contain an ImageData object."); } + sendCustomRequest(SetBrowserActionIcon, "browserAction.setIcon", details, this.definition.parameters); } else { |