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

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: sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference 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 ddde2041a98c1cb7c9a9fa13918b23ea29465996..e347804ecf633a7ff747699a0367075ef68dfc45 100644
--- a/sync/syncable/model_type.cc
+++ b/sync/syncable/model_type.cc
@@ -122,6 +122,9 @@ void AddDefaultFieldValue(ModelType datatype,
case ENHANCED_BOOKMARKS:
specifics->mutable_enhanced_bookmark();
break;
+ case WIFI_CREDENTIALS:
+ specifics->mutable_wifi_credential();
+ break;
default:
NOTREACHED() << "No known extension for model type.";
}
@@ -201,6 +204,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 +337,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 +372,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 +545,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 +628,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 +723,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 +851,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:

Powered by Google App Engine
This is Rietveld 408576698