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

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: Switch to ProxyTypes Created 7 years, 10 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
Index: chrome/browser/sync/sync_prefs.cc
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc
index 9aa75fc97a6fd87817252892a4c08280b5596d7e..62d11127dd65ecd22a89395f2ebc110fe19dcb96 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 proxy types as well, as they can be individually selected,
+ // although they don't have sync representations.
+ user_types.PutAll(syncer::ProxyTypes());
+
// Treat bookmarks specially.
RegisterDataTypePreferredPref(prefs, syncer::BOOKMARKS, true);
user_types.Remove(syncer::BOOKMARKS);
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host.cc ('k') | chrome/browser/sync/test/integration/migration_errors_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698