chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc - Issue 1879233008: [Retry to merge into M50] Enable bootstrapping feature by default.

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/chromeos/login/controller_pairing_screen_handler.cc

Issue 1879233008: [Retry to merge into M50] Enable bootstrapping feature by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661

Patch Set: Created 4 years, 8 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/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc ('k') | chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc

index 6f9ea435aa32173f3b2ea668be0caf16e905a9bb..4d3984f85cf15fd34a1751da9899f156c42184c5 100644

--- a/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc

@@ -70,6 +70,7 @@ void ControllerPairingScreenHandler::DeclareLocalizedValues(

std::string prefix;

base::RemoveChars(kJsScreenPath, ".", &prefix);

+ // TODO(xdai): Remove unnecessary strings.

builder->Add(prefix + "WelcomeTitle", IDS_PAIRING_CONTROLLER_WELCOME);

builder->Add(prefix + "Searching", IDS_PAIRING_CONTROLLER_SEARCHING);

builder->Add(prefix + "HelpBtn", IDS_PAIRING_NEED_HELP);

@@ -95,12 +96,12 @@ void ControllerPairingScreenHandler::DeclareLocalizedValues(

IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TEXT);

builder->Add(prefix + "HostNetworkErrorTitle",

IDS_PAIRING_CONTROLLER_HOST_NETWORK_ERROR_TITLE);

- builder->Add(prefix + "EnrollTitle", IDS_PAIRING_ENROLL_TITLE);

+ builder->Add(prefix + "EnrollTitle", IDS_PAIRING_CONTROLLER_ENROLL_TITLE);

builder->Add(prefix + "EnrollText1", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_1);

builder->Add(prefix + "EnrollText2", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_2);

builder->Add(prefix + "ContinueBtn", IDS_PAIRING_CONTROLLER_CONTINUE);

builder->Add(prefix + "EnrollmentInProgress",

- IDS_PAIRING_ENROLLMENT_IN_PROGRESS);

+ IDS_PAIRING_CONTROLLER_ENROLLMENT_IN_PROGRESS);

builder->Add(prefix + "EnrollmentErrorTitle",

IDS_PAIRING_ENROLLMENT_ERROR_TITLE);

builder->Add(prefix + "EnrollmentErrorHostRestarts",