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

Unified Diff: chrome/browser/sync/glue/typed_url_model_associator.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:
View side-by-side diff with in-line comments
Download patch
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 5109a97b21a255291e59d090b989dd4e04c05a5c..ac07ff7011f0248af6c8479ecebc4c14e6084fe1 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator.cc
+++ b/chrome/browser/sync/glue/typed_url_model_associator.cc
@@ -820,9 +820,9 @@ void TypedUrlModelAssociator::UpdateURLRowFromTypedUrlSpecifics(
bool TypedUrlModelAssociator::CryptoReadyIfNecessary() {
// We only access the cryptographer while holding a transaction.
sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
- syncable::ModelTypeSet encrypted_types;
- encrypted_types = sync_api::GetEncryptedTypes(&trans);
- return encrypted_types.count(syncable::TYPED_URLS) == 0 ||
+ const syncable::ModelEnumSet encrypted_types =
+ sync_api::GetEncryptedTypes(&trans);
+ return !encrypted_types.Has(syncable::TYPED_URLS) ||
sync_service_->IsCryptographerReady(&trans);
}
« no previous file with comments | « chrome/browser/sync/glue/theme_model_associator.cc ('k') | chrome/browser/sync/internal_api/base_transaction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698