Implement new page action API.

chrome/renderer/extensions/extension_process_bindings.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "chrome/renderer/extensions/extension_process_bindings.h"
@@ skipping 193 matching lines @@
     } else if (name->Equals(v8::String::New("OpenChannelToTab"))) {
       return v8::FunctionTemplate::New(OpenChannelToTab);
     } else if (name->Equals(v8::String::New("GetCurrentPageActions"))) {
       return v8::FunctionTemplate::New(GetCurrentPageActions);
     } else if (name->Equals(v8::String::New("StartRequest"))) {
       return v8::FunctionTemplate::New(StartRequest);
     } else if (name->Equals(v8::String::New("GetRenderViewId"))) {
       return v8::FunctionTemplate::New(GetRenderViewId);
     } else if (name->Equals(v8::String::New("GetL10nMessage"))) {
       return v8::FunctionTemplate::New(GetL10nMessage);
-    } else if (name->Equals(v8::String::New("SetBrowserActionIcon"))) {
-      return v8::FunctionTemplate::New(SetBrowserActionIcon);
+    } else if (name->Equals(v8::String::New("SetExtensionActionIcon"))) {
+      return v8::FunctionTemplate::New(SetExtensionActionIcon);
     }
 
     return ExtensionBase::GetNativeFunction(name);
   }
 
  private:
   static v8::Handle<v8::Value> GetExtensionAPIDefinition(
       const v8::Arguments& args) {
     return v8::String::New(GetStringResource<IDR_EXTENSION_API_JSON>());
   }
@@ skipping 174 matching lines @@
     // Since we do the serialization in the v8 extension, we should always get
     // valid JSON.
     if (!value_args) {
       NOTREACHED() << "Invalid JSON passed to StartRequest.";
       return v8::Undefined();
     }
 
     return StartRequestCommon(args, value_args);
   }
 
-  // A special request for setting the browser action icon. This function
+  // A special request for setting the extension action icon. This function
   // 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) {
+  static v8::Handle<v8::Value> SetExtensionActionIcon(const v8::Arguments& args) {
     v8::Local<v8::Object> details = args[1]->ToObject();
+    int tab_id = details->Get(v8::String::New("tabId"))->Int32Value();
     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();
     int height = image_data->Get(v8::String::New("height"))->Int32Value();
 
     int data_length = data->Get(v8::String::New("length"))->Int32Value();
     if (data_length != 4 * width * height) {
-      NOTREACHED() <<
-          "Invalid argument to browserAction.setIcon. Expecting ImageData.";
+      NOTREACHED() << "Invalid argument to setIcon. Expecting ImageData.";
       return v8::Undefined();
     }
 
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
     bitmap.allocPixels();
     bitmap.eraseARGB(0, 0, 0, 0);
 
     uint32_t* pixels = bitmap.getAddr32(0, 0);
     for (int t = 0; t < width*height; t++) {
       // |data| is RGBA, pixels is ARGB.
       pixels[t] =
           ((data->Get(v8::Integer::New(4*t + 3))->Int32Value() & 0xFF) << 24) |
           ((data->Get(v8::Integer::New(4*t + 0))->Int32Value() & 0xFF) << 16) |
           ((data->Get(v8::Integer::New(4*t + 1))->Int32Value() & 0xFF) << 8) |
           ((data->Get(v8::Integer::New(4*t + 2))->Int32Value() & 0xFF) << 0);
     }
 
     // Construct the Value object.
     IPC::Message bitmap_pickle;
     IPC::WriteParam(&bitmap_pickle, bitmap);
     Value* bitmap_value = BinaryValue::CreateWithCopiedBuffer(
         static_cast<const char*>(bitmap_pickle.data()), bitmap_pickle.size());
 
-    return StartRequestCommon(args, bitmap_value);
+    DictionaryValue* dict = new DictionaryValue();
+    dict->Set(L"imageData", bitmap_value);
+    dict->SetInteger(L"tabId", tab_id);
+
+    return StartRequestCommon(args, dict);
   }
 
   static v8::Handle<v8::Value> GetRenderViewId(const v8::Arguments& args) {
     RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
     if (!renderview)
       return v8::Undefined();
     return v8::Integer::New(renderview->routing_id());
   }
 };
 
@@ skipping 138 matching lines @@
     return;
 
   v8::HandleScope handle_scope;
   WebFrame* frame = view->mainFrame();
   v8::Local<v8::Context> context = frame->mainWorldScriptContext();
   v8::Handle<v8::Value> argv[1];
   argv[0] = v8::String::New(type_str);
   bindings_utils::CallFunctionInContext(context, "setViewType",
                                         arraysize(argv), argv);
 }