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

Unified Diff: components/sync/syncable/model_type.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
« no previous file with comments | « components/sync/driver/sync_policy_handler.cc ('k') | components/sync_preferences/pref_model_associator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/syncable/model_type.cc
diff --git a/components/sync/syncable/model_type.cc b/components/sync/syncable/model_type.cc
index 08fa26d6e9b95e366a51f651a0c4428929821434..d256055fcc8e63cab1b1729f751c2cdd65ecdc80 100644
--- a/components/sync/syncable/model_type.cc
+++ b/components/sync/syncable/model_type.cc
@@ -615,11 +615,11 @@ base::StringValue* ModelTypeToValue(ModelType model_type) {
}
ModelType ModelTypeFromValue(const base::Value& value) {
- if (value.IsType(base::Value::TYPE_STRING)) {
+ if (value.IsType(base::Value::Type::STRING)) {
std::string result;
CHECK(value.GetAsString(&result));
return ModelTypeFromString(result);
- } else if (value.IsType(base::Value::TYPE_INTEGER)) {
+ } else if (value.IsType(base::Value::Type::INTEGER)) {
int result;
CHECK(value.GetAsInteger(&result));
return ModelTypeFromInt(result);
« no previous file with comments | « components/sync/driver/sync_policy_handler.cc ('k') | components/sync_preferences/pref_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698