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

Unified Diff: content/browser/service_manager/merge_dictionary.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: content/browser/service_manager/merge_dictionary.cc
diff --git a/content/browser/service_manager/merge_dictionary.cc b/content/browser/service_manager/merge_dictionary.cc
index 231264b5656a1115fda84d591693b6a484b81375..cee4593e12299cc1d904975d6591feb29d6e3d5f 100644
--- a/content/browser/service_manager/merge_dictionary.cc
+++ b/content/browser/service_manager/merge_dictionary.cc
@@ -12,7 +12,7 @@ void MergeDictionary(base::DictionaryValue* target,
it.Advance()) {
const base::Value* merge_value = &it.value();
// Check whether we have to merge dictionaries.
- if (merge_value->IsType(base::Value::TYPE_DICTIONARY)) {
+ if (merge_value->IsType(base::Value::Type::DICTIONARY)) {
base::DictionaryValue* sub_dict;
if (target->GetDictionaryWithoutPathExpansion(it.key(), &sub_dict)) {
MergeDictionary(
@@ -21,7 +21,7 @@ void MergeDictionary(base::DictionaryValue* target,
continue;
}
}
- if (merge_value->IsType(base::Value::TYPE_LIST)) {
+ if (merge_value->IsType(base::Value::Type::LIST)) {
const base::ListValue* merge_list = nullptr;
if (merge_value->GetAsList(&merge_list)) {
base::ListValue* target_list = nullptr;

Powered by Google App Engine
This is Rietveld 408576698