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

Unified Diff: components/sync/syncable/nigori_util.cc

Issue 2241583003: Creating protobuf for reading list sync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 3 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
« no previous file with comments | « components/sync/syncable/model_type_unittest.cc ('k') | components/sync/tools/testserver/chromiumsync.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/syncable/nigori_util.cc
diff --git a/components/sync/syncable/nigori_util.cc b/components/sync/syncable/nigori_util.cc
index 16f6afc4827ea582b8a327a6bff94c209bb43ac2..7acaba800abcda76c6acfac162dc83febf47a4c5 100644
--- a/components/sync/syncable/nigori_util.cc
+++ b/components/sync/syncable/nigori_util.cc
@@ -246,7 +246,7 @@ void UpdateNigoriFromEncryptedTypes(ModelTypeSet encrypted_types,
bool encrypt_everything,
sync_pb::NigoriSpecifics* nigori) {
nigori->set_encrypt_everything(encrypt_everything);
- static_assert(38 == MODEL_TYPE_COUNT, "update encrypted types");
+ static_assert(39 == MODEL_TYPE_COUNT, "update encrypted types");
nigori->set_encrypt_bookmarks(encrypted_types.Has(BOOKMARKS));
nigori->set_encrypt_preferences(encrypted_types.Has(PREFERENCES));
nigori->set_encrypt_autofill_profile(encrypted_types.Has(AUTOFILL_PROFILE));
@@ -270,6 +270,7 @@ void UpdateNigoriFromEncryptedTypes(ModelTypeSet encrypted_types,
nigori->set_encrypt_app_list(encrypted_types.Has(APP_LIST));
nigori->set_encrypt_arc_package(encrypted_types.Has(ARC_PACKAGE));
nigori->set_encrypt_printers(encrypted_types.Has(PRINTERS));
+ nigori->set_encrypt_reading_list(encrypted_types.Has(READING_LIST));
}
ModelTypeSet GetEncryptedTypesFromNigori(
@@ -278,7 +279,7 @@ ModelTypeSet GetEncryptedTypesFromNigori(
return ModelTypeSet::All();
ModelTypeSet encrypted_types;
- static_assert(38 == MODEL_TYPE_COUNT, "update encrypted types");
+ static_assert(39 == MODEL_TYPE_COUNT, "update encrypted types");
if (nigori.encrypt_bookmarks())
encrypted_types.Put(BOOKMARKS);
if (nigori.encrypt_preferences())
@@ -321,6 +322,8 @@ ModelTypeSet GetEncryptedTypesFromNigori(
encrypted_types.Put(ARC_PACKAGE);
if (nigori.encrypt_printers())
encrypted_types.Put(PRINTERS);
+ if (nigori.encrypt_reading_list())
+ encrypted_types.Put(READING_LIST);
return encrypted_types;
}
« no previous file with comments | « components/sync/syncable/model_type_unittest.cc ('k') | components/sync/tools/testserver/chromiumsync.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698