Fix the dynamic browser action setIcon path to work with any size icon.

extensions/renderer/set_icon_natives.cc

 // Copyright 2014 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 "extensions/renderer/set_icon_natives.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/strings/string_number_conversions.h"
 #include "content/public/common/common_param_traits.h"
 #include "extensions/renderer/request_sender.h"
 #include "extensions/renderer/script_context.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/WebKit/public/web/WebArrayBufferConverter.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 
 namespace {
 
-const char* kImageSizeKeys[] = {"19", "38"};
 const char kInvalidDimensions[] = "ImageData has invalid dimensions.";
 const char kInvalidData[] = "ImageData data length does not match dimensions.";
 const char kNoMemory[] = "Chrome was unable to initialize icon.";
 
 }  // namespace
 
 namespace extensions {
 
 SetIconNatives::SetIconNatives(ScriptContext* context)
     : ObjectBackedNativeHandler(context) {
@@ skipping 73 matching lines @@
 
 bool SetIconNatives::ConvertImageDataSetToBitmapValueSet(
     v8::Local<v8::Object>& details,
     v8::Local<v8::Object>* bitmap_set_value) {
   v8::Isolate* isolate = context()->v8_context()->GetIsolate();
   v8::Local<v8::Object> image_data_set =
       details->Get(v8::String::NewFromUtf8(isolate, "imageData"))
           ->ToObject(isolate);
 
   DCHECK(bitmap_set_value);
-  for (size_t i = 0; i < arraysize(kImageSizeKeys); i++) {
-    if (!image_data_set->Has(
-            v8::String::NewFromUtf8(isolate, kImageSizeKeys[i])))
+
+  v8::Local<v8::Array> property_names(image_data_set->GetOwnPropertyNames());
+  for (size_t i = 0; i < property_names->Length(); ++i) {
+    v8::Local<v8::Value> key(property_names->Get(i));
+    v8::String::Utf8Value utf8_key(key);
+    int size;
+    if (!base::StringToInt(std::string(*utf8_key), &size))
       continue;
     v8::Local<v8::Object> image_data =
-        image_data_set->Get(v8::String::NewFromUtf8(isolate, kImageSizeKeys[i]))
-            ->ToObject(isolate);
+        image_data_set->Get(key)->ToObject(isolate);
     v8::Local<v8::Value> image_data_bitmap;
     if (!ConvertImageDataToBitmapValue(image_data, &image_data_bitmap))
       return false;
-    (*bitmap_set_value)->Set(
-        v8::String::NewFromUtf8(isolate, kImageSizeKeys[i]), image_data_bitmap);
+    (*bitmap_set_value)->Set(key, image_data_bitmap);
   }
   return true;
 }
 
 void SetIconNatives::SetIconCommon(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   CHECK_EQ(1, args.Length());
   CHECK(args[0]->IsObject());
   v8::Local<v8::Object> details = args[0]->ToObject(args.GetIsolate());
   v8::Local<v8::Object> bitmap_set_value(v8::Object::New(args.GetIsolate()));
   if (!ConvertImageDataSetToBitmapValueSet(details, &bitmap_set_value))
     return;
 
   v8::Local<v8::Object> dict(v8::Object::New(args.GetIsolate()));
   dict->Set(v8::String::NewFromUtf8(args.GetIsolate(), "imageData"),
             bitmap_set_value);
   if (details->Has(v8::String::NewFromUtf8(args.GetIsolate(), "tabId"))) {
     dict->Set(
         v8::String::NewFromUtf8(args.GetIsolate(), "tabId"),
         details->Get(v8::String::NewFromUtf8(args.GetIsolate(), "tabId")));
   }
   args.GetReturnValue().Set(dict);
 }
 
 }  // namespace extensions