Make base::Value::TYPE a scoped enum.
As mentioned in the base::Value refactor proposal, base::Value::Type should be a
C++11 style scoped enumeration. This change addresses this issue by adding the
required keyword, making the necessary substitutions and adding casts where
needed.
[email protected]
BUG=646113
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
Review-Url: https://codereview.chromium.org/2539363004
Cr-Commit-Position: refs/heads/master@{#436961}
diff --git a/chrome/browser/ui/app_list/search/common/json_response_fetcher.cc b/chrome/browser/ui/app_list/search/common/json_response_fetcher.cc
index b2a88b5..7975c35 100644
--- a/chrome/browser/ui/app_list/search/common/json_response_fetcher.cc
+++ b/chrome/browser/ui/app_list/search/common/json_response_fetcher.cc
@@ -47,7 +47,7 @@
void JSONResponseFetcher::OnJsonParseSuccess(
std::unique_ptr<base::Value> parsed_json) {
- if (!parsed_json->IsType(base::Value::TYPE_DICTIONARY)) {
+ if (!parsed_json->IsType(base::Value::Type::DICTIONARY)) {
OnJsonParseError(kBadResponse);
return;
}
diff --git a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm
index f798950..566bd4c 100644
--- a/chrome/browser/ui/cocoa/applescript/apple_event_util.mm
+++ b/chrome/browser/ui/cocoa/applescript/apple_event_util.mm
@@ -18,26 +18,26 @@
NSAppleEventDescriptor* descriptor = nil;
switch (value->GetType()) {
- case base::Value::TYPE_NULL:
+ case base::Value::Type::NONE:
descriptor = [NSAppleEventDescriptor
descriptorWithTypeCode:cMissingValue];
break;
- case base::Value::TYPE_BOOLEAN: {
+ case base::Value::Type::BOOLEAN: {
bool bool_value;
value->GetAsBoolean(&bool_value);
descriptor = [NSAppleEventDescriptor descriptorWithBoolean:bool_value];
break;
}
- case base::Value::TYPE_INTEGER: {
+ case base::Value::Type::INTEGER: {
int int_value;
value->GetAsInteger(&int_value);
descriptor = [NSAppleEventDescriptor descriptorWithInt32:int_value];
break;
}
- case base::Value::TYPE_DOUBLE: {
+ case base::Value::Type::DOUBLE: {
double double_value;
value->GetAsDouble(&double_value);
descriptor = [NSAppleEventDescriptor
@@ -47,7 +47,7 @@
break;
}
- case base::Value::TYPE_STRING: {
+ case base::Value::Type::STRING: {
std::string string_value;
value->GetAsString(&string_value);
descriptor = [NSAppleEventDescriptor descriptorWithString:
@@ -55,11 +55,11 @@
break;
}
- case base::Value::TYPE_BINARY:
+ case base::Value::Type::BINARY:
NOTREACHED();
break;
- case base::Value::TYPE_DICTIONARY: {
+ case base::Value::Type::DICTIONARY: {
const base::DictionaryValue* dictionary_value;
value->GetAsDictionary(&dictionary_value);
descriptor = [NSAppleEventDescriptor recordDescriptor];
@@ -80,7 +80,7 @@
break;
}
- case base::Value::TYPE_LIST: {
+ case base::Value::Type::LIST: {
const base::ListValue* list_value;
value->GetAsList(&list_value);
descriptor = [NSAppleEventDescriptor listDescriptor];
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 5f8c7a3..0ef7381 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -709,7 +709,7 @@
std::unique_ptr<base::Value> value = content_settings_->GetWebsiteSetting(
site_url_, site_url_, permission_info.type, std::string(), &info);
DCHECK(value.get());
- if (value->GetType() == base::Value::TYPE_INTEGER) {
+ if (value->GetType() == base::Value::Type::INTEGER) {
permission_info.setting =
content_settings::ValueToContentSetting(value.get());
} else {
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc
index f3713b2c..7fb1ea6 100644
--- a/chrome/browser/ui/webui/nacl_ui.cc
+++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -335,7 +335,7 @@
JSONFileValueDeserializer deserializer(pnacl_json_path);
std::string error;
std::unique_ptr<base::Value> root = deserializer.Deserialize(NULL, &error);
- if (!root || !root->IsType(base::Value::TYPE_DICTIONARY))
+ if (!root || !root->IsType(base::Value::Type::DICTIONARY))
return;
// Now try to get the field. This may leave version empty if the
diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
index f843155..a647807 100644
--- a/chrome/browser/ui/webui/options/core_options_handler.cc
+++ b/chrome/browser/ui/webui/options/core_options_handler.cc
@@ -302,11 +302,11 @@
}
switch (value->GetType()) {
- case base::Value::TYPE_BOOLEAN:
- case base::Value::TYPE_INTEGER:
- case base::Value::TYPE_DOUBLE:
- case base::Value::TYPE_STRING:
- case base::Value::TYPE_LIST:
+ case base::Value::Type::BOOLEAN:
+ case base::Value::Type::INTEGER:
+ case base::Value::Type::DOUBLE:
+ case base::Value::Type::STRING:
+ case base::Value::Type::LIST:
pref_service->Set(pref_name, *value);
break;
@@ -333,7 +333,7 @@
return;
std::string metric_string = metric;
- if (value->IsType(base::Value::TYPE_BOOLEAN)) {
+ if (value->IsType(base::Value::Type::BOOLEAN)) {
bool bool_value;
CHECK(value->GetAsBoolean(&bool_value));
metric_string += bool_value ? "_Enable" : "_Disable";
@@ -447,7 +447,7 @@
// Get callback JS function name.
const base::Value* callback;
- if (!args->Get(0, &callback) || !callback->IsType(base::Value::TYPE_STRING))
+ if (!args->Get(0, &callback) || !callback->IsType(base::Value::Type::STRING))
return;
base::string16 callback_function;
@@ -462,7 +462,7 @@
if (!args->Get(i, &list_member))
break;
- if (!list_member->IsType(base::Value::TYPE_STRING))
+ if (!list_member->IsType(base::Value::Type::STRING))
continue;
std::string pref_name;
@@ -493,7 +493,7 @@
// Just ignore bad pref identifiers for now.
std::string pref_name;
- if (!list_member->IsType(base::Value::TYPE_STRING) ||
+ if (!list_member->IsType(base::Value::Type::STRING) ||
!list_member->GetAsString(&pref_name))
continue;
@@ -545,7 +545,7 @@
switch (type) {
case TYPE_BOOLEAN:
- if (!value->IsType(base::Value::TYPE_BOOLEAN)) {
+ if (!value->IsType(base::Value::Type::BOOLEAN)) {
NOTREACHED();
return;
}
@@ -563,13 +563,13 @@
break;
}
case TYPE_DOUBLE:
- if (!value->IsType(base::Value::TYPE_DOUBLE)) {
+ if (!value->IsType(base::Value::Type::DOUBLE)) {
NOTREACHED();
return;
}
break;
case TYPE_STRING:
- if (!value->IsType(base::Value::TYPE_STRING)) {
+ if (!value->IsType(base::Value::Type::STRING)) {
NOTREACHED();
return;
}
@@ -594,7 +594,7 @@
}
temp_value = base::JSONReader::Read(json_string);
value = temp_value.get();
- if (!value || !value->IsType(base::Value::TYPE_LIST)) {
+ if (!value || !value->IsType(base::Value::Type::LIST)) {
NOTREACHED();
return;
}
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc
index de784ef..1a47f6e 100644
--- a/chrome/browser/ui/webui/options/preferences_browsertest.cc
+++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc
@@ -900,13 +900,13 @@
void SetProxyPref(const std::string& name, const base::Value& value) {
std::string type;
switch (value.GetType()) {
- case base::Value::TYPE_BOOLEAN:
+ case base::Value::Type::BOOLEAN:
type = "Boolean";
break;
- case base::Value::TYPE_INTEGER:
+ case base::Value::Type::INTEGER:
type = "Integer";
break;
- case base::Value::TYPE_STRING:
+ case base::Value::Type::STRING:
type = "String";
break;
default:
diff --git a/chrome/browser/ui/webui/settings/certificates_handler.cc b/chrome/browser/ui/webui/settings/certificates_handler.cc
index 516d476..16503d82 100644
--- a/chrome/browser/ui/webui/settings/certificates_handler.cc
+++ b/chrome/browser/ui/webui/settings/certificates_handler.cc
@@ -89,8 +89,8 @@
bool operator()(const std::unique_ptr<base::Value>& a,
const std::unique_ptr<base::Value>& b) const {
- DCHECK(a->GetType() == base::Value::TYPE_DICTIONARY);
- DCHECK(b->GetType() == base::Value::TYPE_DICTIONARY);
+ DCHECK(a->GetType() == base::Value::Type::DICTIONARY);
+ DCHECK(b->GetType() == base::Value::Type::DICTIONARY);
const base::DictionaryValue* a_dict;
bool a_is_dictionary = a->GetAsDictionary(&a_dict);
DCHECK(a_is_dictionary);
diff --git a/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc b/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc
index 9587dbd..6d310f4 100644
--- a/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc
+++ b/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc
@@ -160,7 +160,7 @@
EXPECT_EQ("sync.confirmation.setUserImageURL",
web_ui()->call_data()[0]->function_name());
EXPECT_TRUE(
- web_ui()->call_data()[0]->arg1()->IsType(base::Value::TYPE_STRING));
+ web_ui()->call_data()[0]->arg1()->IsType(base::Value::Type::STRING));
std::string passed_picture_url;
EXPECT_TRUE(
web_ui()->call_data()[0]->arg1()->GetAsString(&passed_picture_url));
@@ -204,7 +204,7 @@
EXPECT_EQ("sync.confirmation.setUserImageURL",
web_ui()->call_data()[1]->function_name());
EXPECT_TRUE(
- web_ui()->call_data()[1]->arg1()->IsType(base::Value::TYPE_STRING));
+ web_ui()->call_data()[1]->arg1()->IsType(base::Value::Type::STRING));
std::string passed_picture_url;
EXPECT_TRUE(
web_ui()->call_data()[1]->arg1()->GetAsString(&passed_picture_url));
