sync/internal_api/sync_encryption_handler_impl.cc - Issue 10832286: sync: Introduce control data types

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/internal_api/sync_encryption_handler_impl.cc

Issue 10832286: sync: Introduce control data types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 4 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:

Index: sync/internal_api/sync_encryption_handler_impl.cc

diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc

index 6ebe4a9f231cf239f0e851c778a54842185651cb..1d65ee427f916df0cb64c29d21ad2068bf131450 100644

--- a/sync/internal_api/sync_encryption_handler_impl.cc

+++ b/sync/internal_api/sync_encryption_handler_impl.cc

@@ -402,7 +402,7 @@ void SyncEncryptionHandlerImpl::ReEncryptEverything(

ModelTypeSet encrypted_types = GetEncryptedTypes();

for (ModelTypeSet::Iterator iter = encrypted_types.First();

iter.Good(); iter.Inc()) {

- if (iter.Get() == PASSWORDS || iter.Get() == NIGORI)

+ if (iter.Get() == PASSWORDS || IsControlType(iter.Get()))

continue; // These types handle encryption differently.

ReadNode type_root(trans);