Handle more scale factors for extension Browser Action icons

chrome/common/extensions/api/extension_action/action_info.cc

Index: chrome/common/extensions/api/extension_action/action_info.cc
diff --git a/chrome/common/extensions/api/extension_action/action_info.cc b/chrome/common/extensions/api/extension_action/action_info.cc
index 8cf0386d3613ed37f4524ca95cfa98975ac805c4..a3be61b6447c46c5d3d0912dc408118b8f108de6 100644
--- a/chrome/common/extensions/api/extension_action/action_info.cc
+++ b/chrome/common/extensions/api/extension_action/action_info.cc
@@ -91,25 +91,17 @@ scoped_ptr<ActionInfo> ActionInfo::Load(const Extension* extension,
     const base::DictionaryValue* icons_value = NULL;
     std::string default_icon;
     if (dict->GetDictionary(keys::kPageActionDefaultIcon, &icons_value)) {
-      int icon_sizes[extension_misc::kNumExtensionActionIconSizes];
-      for (size_t i = 0u; i < extension_misc::kNumExtensionActionIconSizes; ++i)
-        icon_sizes[i] = extension_misc::kExtensionActionIconSizes[i].size;
-      if (!manifest_handler_helpers::LoadIconsFromDictionary(
-              icons_value,
-              icon_sizes,
-              extension_misc::kNumExtensionActionIconSizes,
-              &result->default_icon,
-              error)) {
+      if (!manifest_handler_helpers::LoadAllIconsFromDictionary(
+              icons_value, &result->default_icon, error)) {
         return scoped_ptr<ActionInfo>();
       }
     } else if (dict->GetString(keys::kPageActionDefaultIcon, &default_icon) &&
                manifest_handler_helpers::NormalizeAndValidatePath(
                    &default_icon)) {
-      // Choose the most optimistic (highest) icon density - e.g. 38 not 19 -
-      // regardless of the actual icon resolution, whatever that happens to be.
-      // Code elsewhere knows how to scale 38 down to 19.
-      result->default_icon.Add(extension_misc::EXTENSION_ICON_ACTION *
-                                   extension_misc::kNumExtensionActionIconSizes,
+      // Choose the most optimistic (highest) icon density regardless of the
+      // actual icon resolution, whatever that happens to be. Code elsewhere
+      // knows how to scale down to 19.
+      result->default_icon.Add(extension_misc::EXTENSION_ICON_GIGANTOR,
                                default_icon);
     } else {
       *error = base::ASCIIToUTF16(errors::kInvalidPageActionIconPath);