Handle more scale factors for extension Browser Action icons

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

 // Copyright (c) 2012 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 "chrome/common/extensions/api/extension_action/action_info.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/extensions/api/commands/commands_handler.h"
 #include "extensions/common/constants.h"
@@ skipping 73 matching lines @@
     }
   }
 
   // Read the page action |default_icon| (optional).
   // The |default_icon| value can be either dictionary {icon size -> icon path}
   // or non empty string value.
   if (dict->HasKey(keys::kPageActionDefaultIcon)) {
     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);
       return scoped_ptr<ActionInfo>();
     }
   }
 
   // Read the page action title from |default_title| if present, |name| if not
   // (both optional).
   if (dict->HasKey(keys::kPageActionDefaultTitle)) {
@@ skipping 97 matching lines @@
 
 // static
 bool ActionInfo::IsVerboseInstallMessage(const Extension* extension) {
   const ActionInfo* page_action_info = GetPageActionInfo(extension);
   return page_action_info &&
       (CommandsInfo::GetPageActionCommand(extension) ||
        !page_action_info->default_icon.empty());
 }
 
 }  // namespace extensions