Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: sync/syncable/model_type.cc

Issue 674633002: sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local-master
Patch Set: resolve conflicts with https://codereview.chromium.org/673983003 Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/syncable/model_type.cc
diff --git a/sync/syncable/model_type.cc b/sync/syncable/model_type.cc
index 59be6f2de881fca8262d026febacd9ecc03dae3e..e2573a778ff5fa12142fada9eb50b9405ae0e437 100644
--- a/sync/syncable/model_type.cc
+++ b/sync/syncable/model_type.cc
@@ -119,6 +119,9 @@ void AddDefaultFieldValue(ModelType datatype,
case ARTICLES:
specifics->mutable_article();
break;
+ case WIFI_CREDENTIALS:
+ specifics->mutable_wifi_credential();
+ break;
default:
NOTREACHED() << "No known extension for model type.";
}
@@ -196,6 +199,8 @@ int GetSpecificsFieldNumberFromModelType(ModelType model_type) {
return sync_pb::EntitySpecifics::kManagedUserSharedSettingFieldNumber;
case ARTICLES:
return sync_pb::EntitySpecifics::kArticleFieldNumber;
+ case WIFI_CREDENTIALS:
+ return sync_pb::EntitySpecifics::kWifiCredentialFieldNumber;
default:
NOTREACHED() << "No known extension for model type.";
return 0;
@@ -324,6 +329,9 @@ ModelType GetModelTypeFromSpecifics(const sync_pb::EntitySpecifics& specifics) {
if (specifics.has_article())
return ARTICLES;
+ if (specifics.has_wifi_credential())
+ return WIFI_CREDENTIALS;
+
return UNSPECIFIED;
}
@@ -356,6 +364,7 @@ ModelTypeSet UserSelectableTypes() {
set.Put(TYPED_URLS);
set.Put(EXTENSIONS);
set.Put(APPS);
+ set.Put(WIFI_CREDENTIALS);
set.Put(PROXY_TABS);
return set;
}
@@ -524,6 +533,8 @@ const char* ModelTypeToString(ModelType model_type) {
return "Managed User Shared Settings";
case ARTICLES:
return "Articles";
+ case WIFI_CREDENTIALS:
+ return "WiFi Credentials";
case PROXY_TABS:
return "Tabs";
default:
@@ -603,6 +614,8 @@ int ModelTypeToHistogramInt(ModelType model_type) {
return 30;
case SYNCED_NOTIFICATION_APP_INFO:
return 31;
+ case WIFI_CREDENTIALS:
+ return 32;
// Silence a compiler warning.
case MODEL_TYPE_COUNT:
return 0;
@@ -696,6 +709,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
@@ -820,6 +835,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();
default:

Powered by Google App Engine
This is Rietveld 408576698