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: fix JS, update data_type_histogram.h, and update histograms.xml 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

« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/ui/webui/sync_setup_handler_unittest.cc » ('j') | tools/metrics/histograms/histograms.xml » ('J')
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 5c894efdc6a686edd944f1263b7dc51afaf672eb..b714f65a798cadf75d40008f2e4ff01982ede528 100644

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

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

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

"typedUrls",

"extensions",

"apps",

- "tabs"

+ "wifiCredentials",

+ "tabs",

};

-COMPILE_ASSERT(33 == syncer::MODEL_TYPE_COUNT,

+COMPILE_ASSERT(34 == syncer::MODEL_TYPE_COUNT,

update_kDataTypeNames_to_match_UserSelectableTypes);

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

@@ -272,6 +273,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 },