chrome/browser/ui/webui/sync_setup_handler.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/ui/webui/sync_setup_handler.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/sync/profile_sync_service.cc ('k') | chrome/browser/ui/webui/sync_setup_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/sync_setup_handler.cc

diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc

index 090372aede33d9b7680a88fb1db87c95cb950159..c8550d84597ecf617fc47ff6e12cb70ad35fa64a 100644

--- a/chrome/browser/ui/webui/sync_setup_handler.cc

+++ b/chrome/browser/ui/webui/sync_setup_handler.cc

@@ -102,10 +102,11 @@ const char* kDataTypeNames[] = {

"typedUrls",

"extensions",

"apps",

- "tabs"

+ "wifiCredentials",

+ "tabs",

};

-COMPILE_ASSERT(32 == syncer::MODEL_TYPE_COUNT,

+COMPILE_ASSERT(33 == syncer::MODEL_TYPE_COUNT,

update_kDataTypeNames_to_match_UserSelectableTypes);

typedef std::map<syncer::ModelType, const char*> ModelTypeNameMap;

@@ -271,6 +272,7 @@ void SyncSetupHandler::GetStaticLocalizedValues(

{ "extensions", IDS_SYNC_DATATYPE_EXTENSIONS },

{ "typedURLs", IDS_SYNC_DATATYPE_TYPED_URLS },

{ "apps", IDS_SYNC_DATATYPE_APPS },

+ { "wifiCredentials", IDS_SYNC_DATATYPE_WIFI_CREDENTIALS },

{ "openTabs", IDS_SYNC_DATATYPE_TABS },

{ "serviceUnavailableError", IDS_SYNC_SETUP_ABORTED_BY_PENDING_CLEAR },

{ "confirmLabel", IDS_SYNC_CONFIRM_PASSPHRASE_LABEL },