Chromium Code Reviews| Index: sync/syncable/model_type.cc |
| diff --git a/sync/syncable/model_type.cc b/sync/syncable/model_type.cc |
| index ddde2041a98c1cb7c9a9fa13918b23ea29465996..463ea107539e85dc4e63cb9cee9f6dacd721b67f 100644 |
| --- a/sync/syncable/model_type.cc |
| +++ b/sync/syncable/model_type.cc |
| @@ -121,6 +121,8 @@ void AddDefaultFieldValue(ModelType datatype, |
| break; |
| case ENHANCED_BOOKMARKS: |
| specifics->mutable_enhanced_bookmark(); |
|
stevenjb
2014/10/24 17:35:18
break;
|
| + case WIFI_CREDENTIALS: |
| + specifics->mutable_wifi_credential(); |
| break; |
| default: |
| NOTREACHED() << "No known extension for model type."; |
| @@ -201,6 +203,8 @@ int GetSpecificsFieldNumberFromModelType(ModelType model_type) { |
| return sync_pb::EntitySpecifics::kArticleFieldNumber; |
| case ENHANCED_BOOKMARKS: |
| return sync_pb::EntitySpecifics::kEnhancedBookmarkFieldNumber; |
| + case WIFI_CREDENTIALS: |
| + return sync_pb::EntitySpecifics::kWifiCredentialFieldNumber; |
| default: |
| NOTREACHED() << "No known extension for model type."; |
| return 0; |
| @@ -332,6 +336,9 @@ ModelType GetModelTypeFromSpecifics(const sync_pb::EntitySpecifics& specifics) { |
| if (specifics.has_enhanced_bookmark()) |
| return ENHANCED_BOOKMARKS; |
| + if (specifics.has_wifi_credential()) |
| + return WIFI_CREDENTIALS; |
| + |
| return UNSPECIFIED; |
| } |
| @@ -364,6 +371,7 @@ ModelTypeSet UserSelectableTypes() { |
| set.Put(TYPED_URLS); |
| set.Put(EXTENSIONS); |
| set.Put(APPS); |
| + set.Put(WIFI_CREDENTIALS); |
| set.Put(PROXY_TABS); |
| return set; |
| } |
| @@ -536,6 +544,8 @@ const char* ModelTypeToString(ModelType model_type) { |
| return "Articles"; |
| case ENHANCED_BOOKMARKS: |
| return "Enhanced Bookmarks"; |
| + case WIFI_CREDENTIALS: |
| + return "WiFi Credentials"; |
| case PROXY_TABS: |
| return "Tabs"; |
| default: |
| @@ -617,6 +627,8 @@ int ModelTypeToHistogramInt(ModelType model_type) { |
| return 31; |
| case ENHANCED_BOOKMARKS: |
| return 32; |
| + case WIFI_CREDENTIALS: |
| + return 33; |
| // Silence a compiler warning. |
| case MODEL_TYPE_COUNT: |
| return 0; |
| @@ -710,6 +722,8 @@ ModelType ModelTypeFromString(const std::string& model_type_string) { |
| return SUPERVISED_USER_SHARED_SETTINGS; |
| else if (model_type_string == "Articles") |
| return ARTICLES; |
| + else if (model_type_string == "WiFi Credentials") |
| + return WIFI_CREDENTIALS; |
| else if (model_type_string == "Tabs") |
| return PROXY_TABS; |
| else if (model_type_string == "Enhanced Bookmarks") |
| @@ -836,6 +850,8 @@ std::string ModelTypeToRootTag(ModelType type) { |
| return "google_chrome_managed_user_shared_settings"; |
| case ARTICLES: |
| return "google_chrome_articles"; |
| + case WIFI_CREDENTIALS: |
| + return "google_chrome_wifi_credentials"; |
| case PROXY_TABS: |
| return std::string(); |
| case ENHANCED_BOOKMARKS: |