Add a "key" entry to InstallWarnings, remove InstallWarning::Format

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/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 27 matching lines @@
     SetActionInfoDefaults(extension, action_info.get());
     ActionInfo::SetScriptBadgeInfo(extension, action_info.release());
     return true;
   }
 
   // So as to not confuse developers if they specify a script badge section
   // in the manifest, show a warning if the script badge declaration isn't
   // going to have any effect.
   if (!FeatureSwitch::script_badges()->IsEnabled()) {
     extension->AddInstallWarning(
-        InstallWarning(InstallWarning::FORMAT_TEXT,
-                       errors::kScriptBadgeRequiresFlag));
+        InstallWarning(errors::kScriptBadgeRequiresFlag, keys::kScriptBadge));
   }
 
   const base::DictionaryValue* dict = NULL;
   if (!extension->manifest()->GetDictionary(keys::kScriptBadge, &dict)) {
     *error = ASCIIToUTF16(errors::kInvalidScriptBadge);
     return false;
   }
 
   action_info = ActionInfo::Load(extension, dict, error);
 
   if (!action_info.get())
     return false;  // Failed to parse script badge definition.
 
   // Script badges always use their extension's title and icon so users can rely
   // on the visual appearance to know which extension is running.  This isn't
   // bulletproof since an malicious extension could use a different 16x16 icon
   // that matches the icon of a trusted extension, and users wouldn't be warned
   // during installation.
 
   if (!action_info->default_title.empty()) {
     extension->AddInstallWarning(
-        InstallWarning(InstallWarning::FORMAT_TEXT,
-                       errors::kScriptBadgeTitleIgnored));
+        InstallWarning(errors::kScriptBadgeTitleIgnored,
+                       keys::kScriptBadge,
+                       keys::kPageActionDefaultTitle));
   }
 
   if (!action_info->default_icon.empty()) {
     extension->AddInstallWarning(
-        InstallWarning(InstallWarning::FORMAT_TEXT,
-                       errors::kScriptBadgeIconIgnored));
+        InstallWarning(errors::kScriptBadgeIconIgnored,
+                       keys::kScriptBadge,
+                       keys::kPageActionDefaultIcon));
   }
 
   SetActionInfoDefaults(extension, action_info.get());
   ActionInfo::SetScriptBadgeInfo(extension, action_info.release());
   return true;
 }
 
 bool ScriptBadgeHandler::AlwaysParseForType(Manifest::Type type) const {
   return type == Manifest::TYPE_EXTENSION;
 }
@@ skipping 11 matching lines @@
           extension_misc::kScriptBadgeIconSizes[i], path);
     }
   }
 }
 
 const std::vector<std::string> ScriptBadgeHandler::Keys() const {
   return SingleKey(keys::kScriptBadge);
 }
 
 }  // namespace extensions