components/sync_driver/sync_prefs.cc - Issue 674633002: sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference

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: components/sync_driver/sync_prefs.cc

Issue 674633002: sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local-master

Patch Set: resolve conflicts with https://codereview.chromium.org/673983003 Created 6 years, 2 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/ui/webui/sync_setup_handler.cc ('K') | « components/sync_driver/pref_names.cc ('k') | components/sync_driver/user_selectable_sync_type.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_driver/sync_prefs.cc

diff --git a/components/sync_driver/sync_prefs.cc b/components/sync_driver/sync_prefs.cc

index cc7914d74b6a7533d302b188e53f983ffc03f5bc..5773f0f4b217246bd10a69fe0b42cb3d1368c622 100644

--- a/components/sync_driver/sync_prefs.cc

+++ b/components/sync_driver/sync_prefs.cc

@@ -137,6 +137,7 @@ void SyncPrefs::RegisterProfilePrefs(

model_set.Put(syncer::TYPED_URLS);

model_set.Put(syncer::SESSIONS);

model_set.Put(syncer::ARTICLES);

+ model_set.Put(syncer::WIFI_CREDENTIALS);

registry->RegisterListPref(prefs::kSyncAcknowledgedSyncTypes,

syncer::ModelTypeSetToValue(model_set),

user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

@@ -343,6 +344,8 @@ const char* SyncPrefs::GetPrefNameForDataType(syncer::ModelType data_type) {

return prefs::kSyncSupervisedUserSharedSettings;

case syncer::DEVICE_INFO:

return prefs::kSyncDeviceInfo;

+ case syncer::WIFI_CREDENTIALS:

+ return prefs::kSyncWifiCredentials;

default:

break;

}

« chrome/browser/ui/webui/sync_setup_handler.cc ('K') | « components/sync_driver/pref_names.cc ('k') | components/sync_driver/user_selectable_sync_type.h » ('j') | no next file with comments »