Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5860)

Unified Diff: chrome/common/extensions/api/extension_action/script_badge_handler.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f68d4a883fb8d49cea4bb4a9b833b01ccb9667a7..4f2c80a59084d2aa0af555723bede64dc2c3f031 100644
--- a/chrome/common/extensions/api/extension_action/script_badge_handler.cc
+++ b/chrome/common/extensions/api/extension_action/script_badge_handler.cc
@@ -12,6 +12,7 @@
#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/common/extensions/feature_switch.h"
#include "chrome/common/extensions/manifest_handler_helpers.h"
+#include "extensions/common/install_warning.h"
namespace errors = extension_manifest_errors;
@@ -33,8 +34,8 @@ bool ScriptBadgeHandler::Parse(const base::Value* value,
// going to have any effect.
if (!FeatureSwitch::script_badges()->IsEnabled()) {
extension->AddInstallWarning(
- Extension::InstallWarning(Extension::InstallWarning::FORMAT_TEXT,
- errors::kScriptBadgeRequiresFlag));
+ InstallWarning(InstallWarning::FORMAT_TEXT,
+ errors::kScriptBadgeRequiresFlag));
}
const DictionaryValue* dict = NULL;
@@ -57,14 +58,14 @@ bool ScriptBadgeHandler::Parse(const base::Value* value,
if (!action_info->default_title.empty()) {
extension->AddInstallWarning(
- Extension::InstallWarning(Extension::InstallWarning::FORMAT_TEXT,
- errors::kScriptBadgeTitleIgnored));
+ InstallWarning(InstallWarning::FORMAT_TEXT,
+ errors::kScriptBadgeTitleIgnored));
}
if (!action_info->default_icon.empty()) {
extension->AddInstallWarning(
- Extension::InstallWarning(Extension::InstallWarning::FORMAT_TEXT,
- errors::kScriptBadgeIconIgnored));
+ InstallWarning(InstallWarning::FORMAT_TEXT,
+ errors::kScriptBadgeIconIgnored));
}
SetActionInfoDefaults(extension, action_info.get());

Powered by Google App Engine
This is Rietveld 408576698