chrome/browser/sync/sync_prefs.cc - Issue 11958029: [Sync] Add support for proxy types

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 11958029: [Sync] Add support for proxy types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix more tests Created 7 years, 11 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 3551bb470cfd48c4e2a3dbfd433939c6f8ac807f..c9f36e84088d8a4ddd4fd27b90e4c21ed62a2b5a 100644

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

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

@@ -69,6 +69,10 @@ void SyncPrefs::RegisterUserPrefs(PrefServiceSyncable* prefs) {

syncer::ModelTypeSet user_types = syncer::UserTypes();

+ // Include local types as well, as they can be individually selected, although

+ // they don't have sync representations.

+ user_types.PutAll(syncer::LocalTypes());

// Treat bookmarks specially.

RegisterDataTypePreferredPref(prefs, syncer::BOOKMARKS, true);

user_types.Remove(syncer::BOOKMARKS);