New Sync datatype for Synced Notifications App Info

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/strings/string_split.h"
 #include "base/values.h"
 #include "sync/protocol/app_notification_specifics.pb.h"
 #include "sync/protocol/app_setting_specifics.pb.h"
@@ skipping 68 matching lines @@
       break;
     case APP_NOTIFICATIONS:
       specifics->mutable_app_notification();
       break;
     case HISTORY_DELETE_DIRECTIVES:
       specifics->mutable_history_delete_directive();
       break;
     case SYNCED_NOTIFICATIONS:
       specifics->mutable_synced_notification();
       break;
+    case SYNCED_NOTIFICATION_APP_INFO:
+      specifics->mutable_synced_notification_app_info();
+      break;
     case DEVICE_INFO:
       specifics->mutable_device_info();
       break;
     case EXPERIMENTS:
       specifics->mutable_experiments();
       break;
     case PRIORITY_PREFERENCES:
       specifics->mutable_priority_preference();
       break;
     case DICTIONARY:
@@ skipping 83 matching lines @@
     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::kSyncedNotificationFieldNumber;
+    case SYNCED_NOTIFICATION_APP_INFO:
+      return sync_pb::EntitySpecifics::kSyncedNotificationAppInfoFieldNumber;
     case DEVICE_INFO:
       return sync_pb::EntitySpecifics::kDeviceInfoFieldNumber;
       break;
     case EXPERIMENTS:
       return sync_pb::EntitySpecifics::kExperimentsFieldNumber;
       break;
     case PRIORITY_PREFERENCES:
       return sync_pb::EntitySpecifics::kPriorityPreferenceFieldNumber;
       break;
     case DICTIONARY:
@@ skipping 102 matching lines @@
 
   if (specifics.has_app_notification())
     return APP_NOTIFICATIONS;
 
   if (specifics.has_history_delete_directive())
     return HISTORY_DELETE_DIRECTIVES;
 
   if (specifics.has_synced_notification())
     return SYNCED_NOTIFICATIONS;
 
+  if (specifics.has_synced_notification_app_info())
+    return SYNCED_NOTIFICATION_APP_INFO;
+
   if (specifics.has_device_info())
     return DEVICE_INFO;
 
   if (specifics.has_experiments())
     return EXPERIMENTS;
 
   if (specifics.has_priority_preference())
     return PRIORITY_PREFERENCES;
 
   if (specifics.has_dictionary())
@@ skipping 56 matching lines @@
 bool IsUserSelectableType(ModelType model_type) {
   return UserSelectableTypes().Has(model_type);
 }
 
 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);
+  // Synced Notification App Info does not have private data, so it is not
+  // encrypted.
+  encryptable_user_types.Remove(SYNCED_NOTIFICATION_APP_INFO);
   // Priority preferences are not encrypted because they might be synced before
   // encryption is ready.
   encryptable_user_types.Remove(PRIORITY_PREFERENCES);
   // Managed user settings are not encrypted since they are set server-side.
   encryptable_user_types.Remove(MANAGED_USER_SETTINGS);
   // Managed users are not encrypted since they are managed server-side.
   encryptable_user_types.Remove(MANAGED_USERS);
   // Managed user shared settings are not encrypted since they are managed
   // server-side and shared between manager and supervised user.
   encryptable_user_types.Remove(MANAGED_USER_SHARED_SETTINGS);
@@ skipping 29 matching lines @@
 bool IsControlType(ModelType model_type) {
   return ControlTypes().Has(model_type);
 }
 
 ModelTypeSet CoreTypes() {
   syncer::ModelTypeSet result;
   result.PutAll(PriorityCoreTypes());
 
   // The following are low priority core types.
   result.Put(SYNCED_NOTIFICATIONS);
+  result.Put(SYNCED_NOTIFICATION_APP_INFO);
 
   return result;
 }
 
 ModelTypeSet PriorityCoreTypes() {
   syncer::ModelTypeSet result;
   result.PutAll(ControlTypes());
 
   // The following are non-control core types.
   result.Put(MANAGED_USERS);
@@ skipping 39 matching lines @@
     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 SYNCED_NOTIFICATION_APP_INFO:
+      return "SyncedNotificationAppInfo";

[Nicolas Zea, 2014/01/28 08:21:03]

Spaces between words (should be reversible with ModelTypeFromString)

     case DEVICE_INFO:
       return "Device Info";
     case EXPERIMENTS:
       return "Experiments";
     case PRIORITY_PREFERENCES:
       return "Priority Preferences";
     case DICTIONARY:
       return "Dictionary";
     case FAVICON_IMAGES:
       return "Favicon Images";
@@ skipping 77 matching lines @@
     case MANAGED_USER_SETTINGS:
       return 26;
     case MANAGED_USERS:
       return 27;
     case ARTICLES:
       return 28;
     case APP_LIST:
       return 29;
     case MANAGED_USER_SHARED_SETTINGS:
       return 30;
+    case SYNCED_NOTIFICATION_APP_INFO:
+      return 31;
     // Silence a compiler warning.
     case MODEL_TYPE_COUNT:
       return 0;
   }
   return 0;
 }
 
 base::StringValue* ModelTypeToValue(ModelType model_type) {
   if (model_type >= FIRST_REAL_MODEL_TYPE) {
     return new base::StringValue(ModelTypeToString(model_type));
@@ skipping 51 matching lines @@
   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 == "Synced Notification App Info")
+    return SYNCED_NOTIFICATION_APP_INFO;
   else if (model_type_string == "Device Info")
     return DEVICE_INFO;
   else if (model_type_string == "Experiments")
     return EXPERIMENTS;
   else if (model_type_string == "Priority Preferences")
     return PRIORITY_PREFERENCES;
   else if (model_type_string == "Dictionary")
     return DICTIONARY;
   else if (model_type_string == "Favicon Images")
     return FAVICON_IMAGES;
@@ skipping 78 matching lines @@
     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 "google_chrome_synced_notifications";
+    case SYNCED_NOTIFICATION_APP_INFO:
+      return "google_chrome_synced_notification_app_info";
     case DEVICE_INFO:
       return "google_chrome_device_info";
     case EXPERIMENTS:
       return "google_chrome_experiments";
     case PRIORITY_PREFERENCES:
       return "google_chrome_priority_preferences";
     case DICTIONARY:
       return "google_chrome_dictionary";
     case FAVICON_IMAGES:
       return "google_chrome_favicon_images";
@@ skipping 32 matching lines @@
 const char kAppSettingNotificationType[] = "APP_SETTING";
 const char kAppNotificationType[] = "APP";
 const char kAppListNotificationType[] = "APP_LIST";
 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 kSyncedNotificationType[] = "SYNCED_NOTIFICATION";
+const char kSyncedNotificationAppInfoType[] = "SYNCED_NOTIFICATION_APP_INFO";
 const char kDeviceInfoNotificationType[] = "DEVICE_INFO";
 const char kExperimentsNotificationType[] = "EXPERIMENTS";
 const char kPriorityPreferenceNotificationType[] = "PRIORITY_PREFERENCE";
 const char kDictionaryNotificationType[] = "DICTIONARY";
 const char kFaviconImageNotificationType[] = "FAVICON_IMAGE";
 const char kFaviconTrackingNotificationType[] = "FAVICON_TRACKING";
 const char kManagedUserSettingNotificationType[] = "MANAGED_USER_SETTING";
 const char kManagedUserNotificationType[] = "MANAGED_USER";
 const char kManagedUserSharedSettingNotificationType[] =
     "MANAGED_USER_SHARED_SETTING";
@@ skipping 50 matching lines @@
       return true;
     case APP_NOTIFICATIONS:
       *notification_type = kAppNotificationNotificationType;
       return true;
     case HISTORY_DELETE_DIRECTIVES:
       *notification_type = kHistoryDeleteDirectiveNotificationType;
       return true;
     case SYNCED_NOTIFICATIONS:
       *notification_type = kSyncedNotificationType;
       return true;
+    case SYNCED_NOTIFICATION_APP_INFO:
+      *notification_type = kSyncedNotificationAppInfoType;
+      return true;
     case DEVICE_INFO:
       *notification_type = kDeviceInfoNotificationType;
       return true;
     case EXPERIMENTS:
       *notification_type = kExperimentsNotificationType;
       return true;
     case PRIORITY_PREFERENCES:
       *notification_type = kPriorityPreferenceNotificationType;
       return true;
     case DICTIONARY:
@@ skipping 73 matching lines @@
     return true;
   } else if (notification_type == kAppNotificationNotificationType) {
     *model_type = APP_NOTIFICATIONS;
     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 == kSyncedNotificationAppInfoType) {
+    *model_type = SYNCED_NOTIFICATION_APP_INFO;
+    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;
   } else if (notification_type == kDictionaryNotificationType) {
@@ skipping 24 matching lines @@
 
 bool IsRealDataType(ModelType model_type) {
   return model_type >= FIRST_REAL_MODEL_TYPE && model_type < MODEL_TYPE_COUNT;
 }
 
 bool IsActOnceDataType(ModelType model_type) {
   return model_type == HISTORY_DELETE_DIRECTIVES;
 }
 
 }  // namespace syncer