components/sync_driver/model_association_manager.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/model_association_manager.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') | « chrome/browser/ui/webui/sync_setup_handler_unittest.cc ('k') | components/sync_driver/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_driver/model_association_manager.cc

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

index 6706c4c0ac859ce66985743e5e4d6f330ecd76c4..426e6e3128768d37abecebd76bfe417e3e97787d 100644

--- a/components/sync_driver/model_association_manager.cc

+++ b/components/sync_driver/model_association_manager.cc

@@ -57,6 +57,7 @@ static const syncer::ModelType kStartOrder[] = {

syncer::SUPERVISED_USER_SETTINGS,

syncer::SUPERVISED_USER_SHARED_SETTINGS,

syncer::ARTICLES,

+ syncer::WIFI_CREDENTIALS,

};

COMPILE_ASSERT(arraysize(kStartOrder) ==

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