chrome/browser/sync/glue/typed_url_model_associator.cc - Issue 8919021: [Sync] Rename ModelEnumSet to ModelTypeSet

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/glue/typed_url_model_associator.cc

Issue 8919021: [Sync] Rename ModelEnumSet to ModelTypeSet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/glue/typed_url_model_associator.cc

diff --git a/chrome/browser/sync/glue/typed_url_model_associator.cc b/chrome/browser/sync/glue/typed_url_model_associator.cc

index ac07ff7011f0248af6c8479ecebc4c14e6084fe1..e68abbb0df234d82ff5e977d36f4297f9713b104 100644

--- a/chrome/browser/sync/glue/typed_url_model_associator.cc

+++ b/chrome/browser/sync/glue/typed_url_model_associator.cc

@@ -820,7 +820,7 @@ void TypedUrlModelAssociator::UpdateURLRowFromTypedUrlSpecifics(

bool TypedUrlModelAssociator::CryptoReadyIfNecessary() {

// We only access the cryptographer while holding a transaction.

sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());

- const syncable::ModelEnumSet encrypted_types =

+ const syncable::ModelTypeSet encrypted_types =

sync_api::GetEncryptedTypes(&trans);

return !encrypted_types.Has(syncable::TYPED_URLS) ||

sync_service_->IsCryptographerReady(&trans);