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

Unified Diff: sync/syncable/model_type.cc

Issue 11445002: Sync user's custom spellcheck dictionary (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge master 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
« no previous file with comments | « sync/protocol/sync_proto.gyp ('k') | sync/syncable/nigori_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/syncable/model_type.cc
diff --git a/sync/syncable/model_type.cc b/sync/syncable/model_type.cc
index 1b0bee44cc32ecc7731da35ca4b6b8444b71661a..f6e5ceed8256fc9600e466a72d7581b7ce7b097c 100644
--- a/sync/syncable/model_type.cc
+++ b/sync/syncable/model_type.cc
@@ -88,6 +88,9 @@ void AddDefaultFieldValue(ModelType datatype,
case PRIORITY_PREFERENCES:
specifics->mutable_priority_preference();
break;
+ case DICTIONARY:
+ specifics->mutable_dictionary();
+ break;
default:
NOTREACHED() << "No known extension for model type.";
}
@@ -162,6 +165,9 @@ int GetSpecificsFieldNumberFromModelType(ModelType model_type) {
case PRIORITY_PREFERENCES:
return sync_pb::EntitySpecifics::kPriorityPreferenceFieldNumber;
break;
+ case DICTIONARY:
+ return sync_pb::EntitySpecifics::kDictionaryFieldNumber;
+ break;
default:
NOTREACHED() << "No known extension for model type.";
return 0;
@@ -269,6 +275,9 @@ ModelType GetModelTypeFromSpecifics(const sync_pb::EntitySpecifics& specifics) {
if (specifics.has_priority_preference())
return PRIORITY_PREFERENCES;
+ if (specifics.has_dictionary())
+ return DICTIONARY;
+
return UNSPECIFIED;
}
@@ -358,6 +367,8 @@ const char* ModelTypeToString(ModelType model_type) {
return "Experiments";
case PRIORITY_PREFERENCES:
return "Priority Preferences";
+ case DICTIONARY:
+ return "Dictionary";
default:
break;
}
@@ -433,6 +444,8 @@ ModelType ModelTypeFromString(const std::string& model_type_string) {
return EXPERIMENTS;
else if (model_type_string == "Priority Preferences")
return PRIORITY_PREFERENCES;
+ else if (model_type_string == "Dictionary")
+ return DICTIONARY;
else
NOTREACHED() << "No known model type corresponding to "
<< model_type_string << ".";
@@ -511,6 +524,8 @@ std::string ModelTypeToRootTag(ModelType type) {
return "google_chrome_experiments";
case PRIORITY_PREFERENCES:
return "google_chrome_priority_preferences";
+ case DICTIONARY:
+ return "google_chrome_dictionary";
default:
break;
}
@@ -542,6 +557,7 @@ const char kSyncedNotificationType[] = "SYNCED_NOTIFICATION";
const char kDeviceInfoNotificationType[] = "DEVICE_INFO";
const char kExperimentsNotificationType[] = "EXPERIMENTS";
const char kPriorityPreferenceNotificationType[] = "PRIORITY_PREFERENCE";
+const char kDictionaryNotificationType[] = "DICTIONARY";
} // namespace
bool RealModelTypeToNotificationType(ModelType model_type,
@@ -604,6 +620,10 @@ bool RealModelTypeToNotificationType(ModelType model_type,
return true;
case PRIORITY_PREFERENCES:
*notification_type = kPriorityPreferenceNotificationType;
+ return true;
+ case DICTIONARY:
+ *notification_type = kDictionaryNotificationType;
+ return true;
default:
break;
}
@@ -668,6 +688,9 @@ bool NotificationTypeToRealModelType(const std::string& notification_type,
} else if (notification_type == kPriorityPreferenceNotificationType) {
*model_type = PRIORITY_PREFERENCES;
return true;
+ } else if (notification_type == kDictionaryNotificationType) {
+ *model_type = DICTIONARY;
+ return true;
}
*model_type = UNSPECIFIED;
return false;
« no previous file with comments | « sync/protocol/sync_proto.gyp ('k') | sync/syncable/nigori_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698