chrome/browser/sync/profile_sync_service.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: chrome/browser/sync/profile_sync_service.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/resources/sync_setup_overlay.js ('K') | « chrome/browser/resources/sync_setup_overlay.js ('k') | chrome/browser/ui/webui/sync_setup_handler.cc » ('j') | chrome/browser/ui/webui/sync_setup_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service.cc

diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc

index 7270d34ebf45b59789b7fc208660cc5aa1ce50b1..15e37eb7e32db528af0a591cea81d3c38fe18fb2 100644

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

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

@@ -1738,10 +1738,11 @@ void ProfileSyncService::UpdateSelectedTypesHistogram(

sync_driver::user_selectable_type::TYPED_URLS,

sync_driver::user_selectable_type::EXTENSIONS,

sync_driver::user_selectable_type::APPS,

- sync_driver::user_selectable_type::PROXY_TABS

+ sync_driver::user_selectable_type::WIFI_CREDENTIAL,

+ sync_driver::user_selectable_type::PROXY_TABS,

};

- COMPILE_ASSERT(32 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram);

+ COMPILE_ASSERT(33 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram);

if (!sync_everything) {

const syncer::ModelTypeSet current_types = GetPreferredDataTypes();