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

Unified Diff: chrome/browser/sync/sync_setup_flow.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/sync_setup_flow.h ('k') | chrome/browser/sync/sync_setup_wizard_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_setup_flow.cc
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index a08bab1cd07ebe150914d5311b827970d0cb88bb..9970641d93e5021875d7705c35a6ff055a357095 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
@@ -29,7 +29,7 @@ namespace {
// Helper function to disable password sync.
void DisablePasswordSync(ProfileSyncService* service) {
- syncable::ModelEnumSet types = service->GetPreferredDataTypes();
+ syncable::ModelTypeSet types = service->GetPreferredDataTypes();
types.Remove(syncable::PASSWORDS);
service->OnUserChoseDatatypes(false, types);
}
@@ -123,9 +123,9 @@ void SyncSetupFlow::GetArgsForConfigure(ProfileSyncService* service,
// Bookmarks, Preferences, and Themes are launched for good, there's no
// going back now. Check if the other data types are registered though.
- const syncable::ModelEnumSet registered_types =
+ const syncable::ModelTypeSet registered_types =
service->GetRegisteredDataTypes();
- const syncable::ModelEnumSet preferred_types =
+ const syncable::ModelTypeSet preferred_types =
service->GetPreferredDataTypes();
args->SetBoolean("passwordsRegistered",
registered_types.Has(syncable::PASSWORDS));
« no previous file with comments | « chrome/browser/sync/sync_setup_flow.h ('k') | chrome/browser/sync/sync_setup_wizard_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698