chrome/browser/sync/sync_prefs.cc - Issue 10825137: FYI: Control Data + Per-Device Metadata

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10825137: FYI: Control Data + Per-Device Metadata (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add PER_USER_METADATA, refactor some encryption code 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:

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..f91a619e67a7d85eb9bab6c47b860c72845e80fd 100644

--- a/chrome/browser/sync/sync_prefs.cc

+++ b/chrome/browser/sync/sync_prefs.cc

@@ -340,8 +340,8 @@ 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) {

+ // Treat these types specially.

+ if (IsControlType(type)) {

continue;

}

RegisterDataTypePreferredPref(type, enable_by_default);