chrome/browser/sync/engine/syncer_util.cc - Issue 8851006: [Sync] Replace all instances of ModelTypeSet with ModelEnumSet

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: chrome/browser/sync/engine/syncer_util.cc

Issue 8851006: [Sync] Replace all instances of ModelTypeSet with ModelEnumSet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Cleanup pass #2 Created 9 years 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: chrome/browser/sync/engine/syncer_util.cc

diff --git a/chrome/browser/sync/engine/syncer_util.cc b/chrome/browser/sync/engine/syncer_util.cc

index 9ffe6dde9f5fc5fd368b9e248aea6331c5349cc8..77551d918a312179fea7ce4d9658f9239711b0e7 100644

--- a/chrome/browser/sync/engine/syncer_util.cc

+++ b/chrome/browser/sync/engine/syncer_util.cc

@@ -299,7 +299,7 @@ UpdateAttemptResponse SyncerUtil::AttemptToUpdateEntry(

cryptographer->Update(nigori);

// Make sure any unsynced changes are properly encrypted as necessary.

- syncable::ModelTypeSet encrypted_types =

+ const syncable::ModelEnumSet encrypted_types =

cryptographer->GetEncryptedTypes();

if (!VerifyUnsyncedChangesAreEncrypted(trans, encrypted_types) &&

(!cryptographer->is_ready() ||