summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/sync_prefs.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync/sync_prefs.cc')
-rw-r--r--chrome/browser/sync/sync_prefs.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc
index 2ba2dd9..1b7a92f 100644
--- a/chrome/browser/sync/sync_prefs.cc
+++ b/chrome/browser/sync/sync_prefs.cc
@@ -336,15 +336,15 @@ void SyncPrefs::RegisterPreferences() {
enable_by_default,
PrefService::UNSYNCABLE_PREF);
+ syncer::ModelTypeSet user_types = syncer::UserTypes();
+
// Treat bookmarks specially.
RegisterDataTypePreferredPref(syncer::BOOKMARKS, true);
- for (int i = syncer::PREFERENCES; i < syncer::MODEL_TYPE_COUNT; ++i) {
- const syncer::ModelType type = syncer::ModelTypeFromInt(i);
- // Also treat nigori specially.
- if (type == syncer::NIGORI) {
- continue;
- }
- RegisterDataTypePreferredPref(type, enable_by_default);
+ user_types.Remove(syncer::BOOKMARKS);
+
+ for (syncer::ModelTypeSet::Iterator it = user_types.First();
+ it.Good(); it.Inc()) {
+ RegisterDataTypePreferredPref(it.Get(), enable_by_default);
}
pref_service_->RegisterBooleanPref(prefs::kSyncManaged,