Chromium Code Reviews| Index: sync/syncable/model_type.cc |
| diff --git a/sync/syncable/model_type.cc b/sync/syncable/model_type.cc |
| index 08478102b5874fa872f5e66c1059b10beac1a929..130a15f85f2d6092a8c2e21417ea4cb2177be461 100644 |
| --- a/sync/syncable/model_type.cc |
| +++ b/sync/syncable/model_type.cc |
| @@ -341,7 +341,7 @@ ModelTypeSet ControlTypes() { |
| ModelTypeSet ProxyTypes() { |
| ModelTypeSet set; |
| - // TODO(zea): add a TABS type here. |
| + set.Put(TABS); |
| return set; |
| } |
| @@ -400,6 +400,8 @@ const char* ModelTypeToString(ModelType model_type) { |
| return "Priority Preferences"; |
| case DICTIONARY: |
| return "Dictionary"; |
| + case TABS: |
| + return "Tabs"; |
| default: |
| break; |
| } |
| @@ -477,6 +479,8 @@ ModelType ModelTypeFromString(const std::string& model_type_string) { |
| return PRIORITY_PREFERENCES; |
| else if (model_type_string == "Dictionary") |
| return DICTIONARY; |
| + else if (model_type_string == "Tabs") |
| + return TABS; |
| else |
| NOTREACHED() << "No known model type corresponding to " |
| << model_type_string << "."; |
| @@ -559,6 +563,8 @@ std::string ModelTypeToRootTag(ModelType type) { |
| return "google_chrome_priority_preferences"; |
| case DICTIONARY: |
| return "google_chrome_dictionary"; |
| + case TABS: |
| + return ""; |
|
tim (not reviewing)
2013/02/09 01:23:59
nit - prefer std::string()
Nicolas Zea
2013/02/12 23:44:49
Done.
|
| default: |
| break; |
| } |