Manifest handler for all keys background-related.

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

Index: chrome/common/extensions/api/extension_action/script_badge_handler.cc
diff --git a/chrome/common/extensions/api/extension_action/script_badge_handler.cc b/chrome/common/extensions/api/extension_action/script_badge_handler.cc
index 444b80d140c65efb95ce1923079d0f28fb1437d1..851c3b4953f3db32ce4a8b8613932df2e41dcc95 100644
--- a/chrome/common/extensions/api/extension_action/script_badge_handler.cc
+++ b/chrome/common/extensions/api/extension_action/script_badge_handler.cc
@@ -17,25 +17,25 @@
 #include "extensions/common/install_warning.h"
 
 namespace errors = extension_manifest_errors;
+namespace keys = extension_manifest_keys;
 
 namespace extensions {
 
 ScriptBadgeHandler::ScriptBadgeHandler() {
-  prerequisite_keys_.push_back(extension_manifest_keys::kIcons);
 }
 
 ScriptBadgeHandler::~ScriptBadgeHandler() {
 }
 
-const std::vector<std::string>& ScriptBadgeHandler::PrerequisiteKeys() {
-  return prerequisite_keys_;
+const std::vector<std::string> ScriptBadgeHandler::PrerequisiteKeys() const {
+  return SingleKey(keys::kIcons);
 }
 
 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)) {
+  if (!extension->manifest()->HasKey(keys::kScriptBadge)) {
     SetActionInfoDefaults(extension, action_info.get());
     ActionInfo::SetScriptBadgeInfo(extension, action_info.release());
     return true;
@@ -51,8 +51,7 @@ bool ScriptBadgeHandler::Parse(Extension* extension, string16* error) {
   }
 
   const DictionaryValue* dict = NULL;
-  if (!extension->manifest()->GetDictionary(
-          extension_manifest_keys::kScriptBadge, &dict)) {
+  if (!extension->manifest()->GetDictionary(keys::kScriptBadge, &dict)) {
     *error = ASCIIToUTF16(errors::kInvalidScriptBadge);
     return false;
   }
@@ -86,7 +85,7 @@ bool ScriptBadgeHandler::Parse(Extension* extension, string16* error) {
   return true;
 }
 
-bool ScriptBadgeHandler::AlwaysParseForType(Manifest::Type type) {
+bool ScriptBadgeHandler::AlwaysParseForType(Manifest::Type type) const {
   return type == Manifest::TYPE_EXTENSION;
 }
 
@@ -105,4 +104,8 @@ void ScriptBadgeHandler::SetActionInfoDefaults(const Extension* extension,
   }
 }
 
+const std::vector<std::string> ScriptBadgeHandler::Keys() const {
+  return SingleKey(keys::kScriptBadge);
+}
+
 }  // namespace extensions