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

Unified Diff: chrome/browser/sync/glue/bookmark_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
« no previous file with comments | « chrome/browser/sync/failed_datatypes_handler.cc ('k') | chrome/browser/sync/glue/data_type_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/bookmark_model_associator.cc
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc
index 8d3066a06e43eb8944e4813333b7e7eeb6c1bb29..03eb2a1c73214dc141728ded0b40af18a727e1a1 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.cc
+++ b/chrome/browser/sync/glue/bookmark_model_associator.cc
@@ -616,9 +616,9 @@ bool BookmarkModelAssociator::LoadAssociations() {
bool BookmarkModelAssociator::CryptoReadyIfNecessary() {
// We only access the cryptographer while holding a transaction.
sync_api::ReadTransaction trans(FROM_HERE, user_share_);
- const syncable::ModelTypeSet& encrypted_types =
+ const syncable::ModelEnumSet encrypted_types =
sync_api::GetEncryptedTypes(&trans);
- return encrypted_types.count(syncable::BOOKMARKS) == 0 ||
+ return !encrypted_types.Has(syncable::BOOKMARKS) ||
trans.GetCryptographer()->is_ready();
}
« no previous file with comments | « chrome/browser/sync/failed_datatypes_handler.cc ('k') | chrome/browser/sync/glue/data_type_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698