sync/syncable/nigori_util.cc - Issue 674633002: sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/syncable/nigori_util.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/nigori_util.cc

diff --git a/sync/syncable/nigori_util.cc b/sync/syncable/nigori_util.cc

index 63dbcac9ee55dcffc356e0778bedfb1df6bd9d11..eaf9eca7513d7190e1938ea452b20d357af94493 100644

--- a/sync/syncable/nigori_util.cc

+++ b/sync/syncable/nigori_util.cc

@@ -243,7 +243,7 @@ void UpdateNigoriFromEncryptedTypes(ModelTypeSet encrypted_types,

bool encrypt_everything,

sync_pb::NigoriSpecifics* nigori) {

nigori->set_encrypt_everything(encrypt_everything);

- COMPILE_ASSERT(32 == MODEL_TYPE_COUNT, UpdateEncryptedTypes);

+ COMPILE_ASSERT(33 == MODEL_TYPE_COUNT, UpdateEncryptedTypes);

nigori->set_encrypt_bookmarks(

encrypted_types.Has(BOOKMARKS));

nigori->set_encrypt_preferences(

@@ -279,7 +279,7 @@ ModelTypeSet GetEncryptedTypesFromNigori(

return ModelTypeSet::All();

ModelTypeSet encrypted_types;

- COMPILE_ASSERT(32 == MODEL_TYPE_COUNT, UpdateEncryptedTypes);

+ COMPILE_ASSERT(33 == MODEL_TYPE_COUNT, UpdateEncryptedTypes);

if (nigori.encrypt_bookmarks())

encrypted_types.Put(BOOKMARKS);

if (nigori.encrypt_preferences())

« chrome/browser/ui/webui/sync_setup_handler.cc ('K') | « sync/syncable/model_type.cc ('k') | sync/tools/testserver/chromiumsync.py » ('j') | no next file with comments »