summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-26 04:41:02 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-26 04:41:02 +0000
commite50f808271db337ac3e4b0d4c760ad77125cf9ff (patch)
tree54e16217ab0a9a18cd0641bd27944016a5ce8af4 /sync
parentcb86ad7cc542d42b00684b8f9974983b4c6af008 (diff)
downloadchromium_src-e50f808271db337ac3e4b0d4c760ad77125cf9ff.zip
chromium_src-e50f808271db337ac3e4b0d4c760ad77125cf9ff.tar.gz
chromium_src-e50f808271db337ac3e4b0d4c760ad77125cf9ff.tar.bz2
[Sync] Fix various model type mistakes for new types
Experiments, SyncedNotifications, Delete directives, and priority preferences all had various bugs in their notification code. BUG=none Review URL: https://chromiumcodereview.appspot.com/12086005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179039 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
-rw-r--r--sync/syncable/model_type.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sync/syncable/model_type.cc b/sync/syncable/model_type.cc
index f6e5cee..719f65b 100644
--- a/sync/syncable/model_type.cc
+++ b/sync/syncable/model_type.cc
@@ -610,8 +610,10 @@ bool RealModelTypeToNotificationType(ModelType model_type,
return true;
case HISTORY_DELETE_DIRECTIVES:
*notification_type = kHistoryDeleteDirectiveNotificationType;
+ return true;
case SYNCED_NOTIFICATIONS:
*notification_type = kSyncedNotificationType;
+ return true;
case DEVICE_INFO:
*notification_type = kDeviceInfoNotificationType;
return true;
@@ -680,11 +682,16 @@ bool NotificationTypeToRealModelType(const std::string& notification_type,
return true;
} else if (notification_type == kHistoryDeleteDirectiveNotificationType) {
*model_type = HISTORY_DELETE_DIRECTIVES;
+ return true;
} else if (notification_type == kSyncedNotificationType) {
*model_type = SYNCED_NOTIFICATIONS;
+ return true;
} else if (notification_type == kDeviceInfoNotificationType) {
*model_type = DEVICE_INFO;;
return true;
+ } else if (notification_type == kExperimentsNotificationType) {
+ *model_type = EXPERIMENTS;
+ return true;
} else if (notification_type == kPriorityPreferenceNotificationType) {
*model_type = PRIORITY_PREFERENCES;
return true;