Create a fresh sync datatype for Synced Notifications

sync/syncable/model_type.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/internal_api/public/base/model_type.h"
 
 #include "base/string_split.h"
 #include "base/values.h"
 #include "sync/protocol/app_notification_specifics.pb.h"
 #include "sync/protocol/app_setting_specifics.pb.h"
@@ skipping 58 matching lines @@
       break;
     case EXTENSION_SETTINGS:
       specifics->mutable_extension_setting();
       break;
     case APP_NOTIFICATIONS:
       specifics->mutable_app_notification();
       break;
     case HISTORY_DELETE_DIRECTIVES:
       specifics->mutable_history_delete_directive();
       break;
+    case SYNCED_NOTIFICATIONS:
+      specifics->synced_notifications();
+      break;
     case DEVICE_INFO:
       specifics->mutable_device_info();
       break;
     case EXPERIMENTS:
       specifics->mutable_experiments();
       break;
     default:
       NOTREACHED() << "No known extension for model type.";
   }
 }
@@ skipping 50 matching lines @@
       return sync_pb::EntitySpecifics::kAppSettingFieldNumber;
       break;
     case EXTENSION_SETTINGS:
       return sync_pb::EntitySpecifics::kExtensionSettingFieldNumber;
       break;
     case APP_NOTIFICATIONS:
       return sync_pb::EntitySpecifics::kAppNotificationFieldNumber;
       break;
     case HISTORY_DELETE_DIRECTIVES:
       return sync_pb::EntitySpecifics::kHistoryDeleteDirectiveFieldNumber;
+    case SYNCED_NOTIFICATIONS:
+      return sync_pb::EntitySpecifics::kSyncedNotificationsFieldNumber;
     case DEVICE_INFO:
       return sync_pb::EntitySpecifics::kDeviceInfoFieldNumber;
       break;
     case EXPERIMENTS:
       return sync_pb::EntitySpecifics::kExperimentsFieldNumber;
       break;
     default:
       NOTREACHED() << "No known extension for model type.";
       return 0;
   }
@@ skipping 81 matching lines @@
 
   if (specifics.has_extension_setting())
     return EXTENSION_SETTINGS;
 
   if (specifics.has_app_notification())
     return APP_NOTIFICATIONS;
 
   if (specifics.has_history_delete_directive())
     return HISTORY_DELETE_DIRECTIVES;
 
+  if (specifics.has_synced_notifications())
+    return SYNCED_NOTIFICATIONS;
+
   if (specifics.has_device_info())
     return DEVICE_INFO;
 
   if (specifics.has_experiments())
     return EXPERIMENTS;
 
   return UNSPECIFIED;
 }
 
 bool ShouldMaintainPosition(ModelType model_type) {
   return model_type == BOOKMARKS;
 }
 
 ModelTypeSet UserTypes() {
   ModelTypeSet set;
   for (int i = FIRST_USER_MODEL_TYPE; i <= LAST_USER_MODEL_TYPE; ++i) {
     set.Put(ModelTypeFromInt(i));
   }
   return set;
 }
 
 ModelTypeSet EncryptableUserTypes() {
   ModelTypeSet encryptable_user_types = UserTypes();
   // We never encrypt history delete directives.
   encryptable_user_types.Remove(HISTORY_DELETE_DIRECTIVES);
+  // Synced notifications are not encrypted since the server must see changes.
+  encryptable_user_types.Remove(SYNCED_NOTIFICATIONS);
   return encryptable_user_types;
 }
 
 ModelTypeSet ControlTypes() {
   ModelTypeSet set;
   for (int i = FIRST_CONTROL_MODEL_TYPE; i <= LAST_CONTROL_MODEL_TYPE; ++i) {
     set.Put(ModelTypeFromInt(i));
   }
 
   return set;
@@ skipping 37 matching lines @@
     case AUTOFILL_PROFILE:
       return "Autofill Profiles";
     case APP_SETTINGS:
       return "App settings";
     case EXTENSION_SETTINGS:
       return "Extension settings";
     case APP_NOTIFICATIONS:
       return "App Notifications";
     case HISTORY_DELETE_DIRECTIVES:
       return "History Delete Directives";
+    case SYNCED_NOTIFICATIONS:
+      return "Synced Notifications";
     case DEVICE_INFO:
       return "Device Info";
     case EXPERIMENTS:
       return "Experiments";
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
@@ skipping 51 matching lines @@
   else if (model_type_string == "Apps")
     return APPS;
   else if (model_type_string == "App settings")
     return APP_SETTINGS;
   else if (model_type_string == "Extension settings")
     return EXTENSION_SETTINGS;
   else if (model_type_string == "App Notifications")
     return APP_NOTIFICATIONS;
   else if (model_type_string == "History Delete Directives")
     return HISTORY_DELETE_DIRECTIVES;
+  else if (model_type_string == "Synced Notifications")
+    return SYNCED_NOTIFICATIONS;
   else if (model_type_string == "Device Info")
     return DEVICE_INFO;
   else if (model_type_string == "Experiments")
     return EXPERIMENTS;
   else
     NOTREACHED() << "No known model type corresponding to "
                  << model_type_string << ".";
   return UNSPECIFIED;
 }
 
@@ skipping 54 matching lines @@
     case AUTOFILL_PROFILE:
       return "google_chrome_autofill_profiles";
     case APP_SETTINGS:
       return "google_chrome_app_settings";
     case EXTENSION_SETTINGS:
       return "google_chrome_extension_settings";
     case APP_NOTIFICATIONS:
       return "google_chrome_app_notifications";
     case HISTORY_DELETE_DIRECTIVES:
       return "google_chrome_history_delete_directives";
+    case SYNCED_NOTIFICATIONS:
+      return "synced_notifications_settings";
     case DEVICE_INFO:
       return "google_chrome_device_info";
     case EXPERIMENTS:
       return "google_chrome_experiments";
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
@@ skipping 11 matching lines @@
 const char kExtensionSettingNotificationType[] = "EXTENSION_SETTING";
 const char kNigoriNotificationType[] = "NIGORI";
 const char kAppSettingNotificationType[] = "APP_SETTING";
 const char kAppNotificationType[] = "APP";
 const char kSearchEngineNotificationType[] = "SEARCH_ENGINE";
 const char kSessionNotificationType[] = "SESSION";
 const char kAutofillProfileNotificationType[] = "AUTOFILL_PROFILE";
 const char kAppNotificationNotificationType[] = "APP_NOTIFICATION";
 const char kHistoryDeleteDirectiveNotificationType[] =
     "HISTORY_DELETE_DIRECTIVE";
+const char kSyncedNotificationsType[] = "SYNCED_NOTIFICATIONS";
 const char kDeviceInfoNotificationType[] = "DEVICE_INFO";
 const char kExperimentsNotificationType[] = "EXPERIMENTS";
 }  // namespace
 
 bool RealModelTypeToNotificationType(ModelType model_type,
                                      std::string* notification_type) {
   switch (model_type) {
     case BOOKMARKS:
       *notification_type = kBookmarkNotificationType;
       return true;
@@ skipping 34 matching lines @@
       *notification_type = kAutofillProfileNotificationType;
       return true;
     case EXTENSION_SETTINGS:
       *notification_type = kExtensionSettingNotificationType;
       return true;
     case APP_NOTIFICATIONS:
       *notification_type = kAppNotificationNotificationType;
       return true;
     case HISTORY_DELETE_DIRECTIVES:
       *notification_type = kHistoryDeleteDirectiveNotificationType;
+    case SYNCED_NOTIFICATIONS:
+      *notification_type = kSyncedNotificationsType;
     case DEVICE_INFO:
       *notification_type = kDeviceInfoNotificationType;
       return true;
     case EXPERIMENTS:
       *notification_type = kExperimentsNotificationType;
       return true;
     default:
       break;
   }
   notification_type->clear();
@@ skipping 42 matching lines @@
     *model_type = APP_SETTINGS;
     return true;
   } else if (notification_type == kExtensionSettingNotificationType) {
     *model_type = EXTENSION_SETTINGS;
     return true;
   } else if (notification_type == kAppNotificationNotificationType) {
     *model_type = APP_NOTIFICATIONS;
     return true;
   } else if (notification_type == kHistoryDeleteDirectiveNotificationType) {
     *model_type = HISTORY_DELETE_DIRECTIVES;
+  } else if (notification_type == kSyncedNotificationsType) {
+    *model_type = SYNCED_NOTIFICATIONS;
   } else if (notification_type == kDeviceInfoNotificationType) {
     *model_type = DEVICE_INFO;;
     return true;
   }
   *model_type = UNSPECIFIED;
   return false;
 }
 
 bool IsRealDataType(ModelType model_type) {
   return model_type >= FIRST_REAL_MODEL_TYPE && model_type < MODEL_TYPE_COUNT;
 }
 
 }  // namespace syncer