summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/extensions
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 00:02:24 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 00:02:24 +0000
commit1288ba0949c899dce33fc6fcc8e212aee704bc48 (patch)
treebc9c5b2a1c969670e1b8a32bc5736b6dc1bb7f63 /chrome/renderer/extensions
parentbe1c57d6ca0e4661760202621db55b536c189041 (diff)
downloadchromium_src-1288ba0949c899dce33fc6fcc8e212aee704bc48.zip
chromium_src-1288ba0949c899dce33fc6fcc8e212aee704bc48.tar.gz
chromium_src-1288ba0949c899dce33fc6fcc8e212aee704bc48.tar.bz2
Update browser actions api to be like new design doc.
BUG=23879 TEST=Install sample gmail browser action sample. Review URL: http://codereview.chromium.org/264046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions')
-rw-r--r--chrome/renderer/extensions/extension_process_bindings.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 197bb42..801fb9d 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -411,7 +411,9 @@ class ExtensionImpl : public ExtensionBase {
// accepts a canvas ImageData object, so it needs to do extra processing
// before sending the request to the browser.
static v8::Handle<v8::Value> SetBrowserActionIcon(const v8::Arguments& args) {
- v8::Local<v8::Object> image_data = args[1]->ToObject();
+ v8::Local<v8::Object> details = args[1]->ToObject();
+ v8::Local<v8::Object> image_data =
+ details->Get(v8::String::New("imageData"))->ToObject();
v8::Local<v8::Object> data =
image_data->Get(v8::String::New("data"))->ToObject();
int width = image_data->Get(v8::String::New("width"))->Int32Value();