Refactor implementation of BrowserActions, and add support for

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 397 matching lines @@
     }
 
     return StartRequestCommon(args, value_args);
   }
 
   // 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> 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 setIcon. Expecting ImageData.";
@@ skipping 16 matching lines @@
     }
 
     // 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());
 
     DictionaryValue* dict = new DictionaryValue();
     dict->Set(L"imageData", bitmap_value);
-    dict->SetInteger(L"tabId", tab_id);
+
+    if (details->Has(v8::String::New("tabId"))) {
+      dict->SetInteger(L"tabId",
+                       details->Get(v8::String::New("tabId"))->Int32Value());
+    }
 
     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 140 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);
 }