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

Unified Diff: chrome/browser/extensions/api/settings_private/prefs_util.cc

Issue 2539363004: Make base::Value::TYPE a scoped enum. (Closed)
Patch Set: Rebase Created 4 years 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/browser/extensions/api/settings_private/prefs_util.cc
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index fe8bc3f5f22fb84a278fb01b5a085afba50da295..0b7d6d97f6e138a20b390cbf2c97de9daecb3c73 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -358,17 +358,17 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
settings_private::PrefType PrefsUtil::GetType(const std::string& name,
base::Value::Type type) {
switch (type) {
- case base::Value::Type::TYPE_BOOLEAN:
+ case base::Value::Type::BOOLEAN:
return settings_private::PrefType::PREF_TYPE_BOOLEAN;
- case base::Value::Type::TYPE_INTEGER:
- case base::Value::Type::TYPE_DOUBLE:
+ case base::Value::Type::INTEGER:
+ case base::Value::Type::DOUBLE:
return settings_private::PrefType::PREF_TYPE_NUMBER;
- case base::Value::Type::TYPE_STRING:
+ case base::Value::Type::STRING:
return IsPrefTypeURL(name) ? settings_private::PrefType::PREF_TYPE_URL
: settings_private::PrefType::PREF_TYPE_STRING;
- case base::Value::Type::TYPE_LIST:
+ case base::Value::Type::LIST:
return settings_private::PrefType::PREF_TYPE_LIST;
- case base::Value::Type::TYPE_DICTIONARY:
+ case base::Value::Type::DICTIONARY:
return settings_private::PrefType::PREF_TYPE_DICTIONARY;
default:
return settings_private::PrefType::PREF_TYPE_NONE;
@@ -503,13 +503,13 @@ PrefsUtil::SetPrefResult PrefsUtil::SetPref(const std::string& pref_name,
DCHECK_EQ(pref->GetType(), value->GetType());
switch (pref->GetType()) {
- case base::Value::TYPE_BOOLEAN:
- case base::Value::TYPE_DOUBLE:
- case base::Value::TYPE_LIST:
- case base::Value::TYPE_DICTIONARY:
+ case base::Value::Type::BOOLEAN:
+ case base::Value::Type::DOUBLE:
+ case base::Value::Type::LIST:
+ case base::Value::Type::DICTIONARY:
pref_service->Set(pref_name, *value);
break;
- case base::Value::TYPE_INTEGER: {
+ case base::Value::Type::INTEGER: {
// In JS all numbers are doubles.
double double_value;
if (!value->GetAsDouble(&double_value))
@@ -518,7 +518,7 @@ PrefsUtil::SetPrefResult PrefsUtil::SetPref(const std::string& pref_name,
pref_service->SetInteger(pref_name, static_cast<int>(double_value));
break;
}
- case base::Value::TYPE_STRING: {
+ case base::Value::Type::STRING: {
std::string string_value;
if (!value->GetAsString(&string_value))
return PREF_TYPE_MISMATCH;

Powered by Google App Engine
This is Rietveld 408576698