Move Icons out of Extension class

chrome/common/extensions/api/extension_action/script_badge_handler.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/script_badge_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/manifest_handler_helpers.h"
 #include "extensions/common/install_warning.h"
 
 namespace errors = extension_manifest_errors;
 
 namespace extensions {
 
 ScriptBadgeHandler::ScriptBadgeHandler() {
+  prerequisite_keys_.push_back(extension_manifest_keys::kIcons);
 }
 
 ScriptBadgeHandler::~ScriptBadgeHandler() {
 }
 
+const std::vector<std::string>& ScriptBadgeHandler::PrerequisiteKeys() {

[Yoyo Zhou, 2013/02/27 20:09:14]

By the way, I later realized, it doesn't make sense to return by reference here.
If you want to change it so that it doesn't, feel free; otherwise, I'll do it in
my pending CL.

+  return prerequisite_keys_;
+}
+
 bool ScriptBadgeHandler::Parse(Extension* extension, string16* error) {
   scoped_ptr<ActionInfo> action_info(new ActionInfo);
 
   // Provide a default script badge if one isn't declared in the manifest.
   if (!extension->manifest()->HasKey(extension_manifest_keys::kScriptBadge)) {
     SetActionInfoDefaults(extension, action_info.get());
     ActionInfo::SetScriptBadgeInfo(extension, action_info.release());
     return true;
   }
 
@@ skipping 44 matching lines @@
 
 bool ScriptBadgeHandler::AlwaysParseForType(Manifest::Type type) {
   return type == Manifest::TYPE_EXTENSION;
 }
 
 void ScriptBadgeHandler::SetActionInfoDefaults(const Extension* extension,
                                                ActionInfo* info) {
   info->default_title = extension->name();
   info->default_icon.Clear();
   for (size_t i = 0; i < extension_misc::kNumScriptBadgeIconSizes; ++i) {
-    std::string path = extension->icons().Get(
+    std::string path = IconsInfo::GetIcons(extension).Get(
         extension_misc::kScriptBadgeIconSizes[i],
         ExtensionIconSet::MATCH_BIGGER);
     if (!path.empty()) {
       info->default_icon.Add(
           extension_misc::kScriptBadgeIconSizes[i], path);
     }
   }
 }
 
 }  // namespace extensions