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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/sync_prefs.cc

Issue 10832286: sync: Introduce control data types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 months 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
« chrome/browser/sync/glue/data_type_manager_impl_unittest.cc ('K') | « chrome/browser/sync/glue/sync_backend_registrar_unittest.cc ('k') | chrome/browser/sync/sync_prefs_unittest.cc » ('j') | sync/engine/apply_control_data_updates.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_prefs.cc
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc
index 2ba2dd959c8e702b95e05e6b0b1606580a5ac6a3..c89dba4f4e2d6c7340fe6f2368c1981a6c65b409 100644
--- a/chrome/browser/sync/sync_prefs.cc
+++ b/chrome/browser/sync/sync_prefs.cc
@@ -340,10 +340,9 @@ void SyncPrefs::RegisterPreferences() {
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) {
+ // Control types are not user-selectable.
+ if (IsControlType(type))
continue;
- }
RegisterDataTypePreferredPref(type, enable_by_default);
}
« chrome/browser/sync/glue/data_type_manager_impl_unittest.cc ('K') | « chrome/browser/sync/glue/sync_backend_registrar_unittest.cc ('k') | chrome/browser/sync/sync_prefs_unittest.cc » ('j') | sync/engine/apply_control_data_updates.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698