chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc - Issue 1535573002: 1) Add initialization error page; 2) Add connection error page.

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/host_pairing_screen_handler.cc

Issue 1535573002: 1) Add initialization error page; 2) Add connection error page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: We don't need to set enrollment related local state for a host device since Enrollment Screen doesn… Created 5 years 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/resources/chromeos/login/host-pairing-screen.html ('k') | components/pairing/bluetooth_host_pairing_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 53119db9f8c177eccc61248b772d9f954499900e..71f2fee96944b45c6e674b22a463e3bed88d0486 100644

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

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

@@ -79,11 +79,19 @@ void HostPairingScreenHandler::DeclareLocalizedValues(

builder->Add(prefix + "EnrollmentErrorTitle",

IDS_PAIRING_ENROLLMENT_ERROR_TITLE);

builder->Add(prefix + "ErrorNeedsRestart",

- IDS_PAIRING_HOST_EROLLMENT_ERROR_NEEDS_RESTART);

+ IDS_PAIRING_HOST_ERROR_NEED_RESTART_TEXT);

builder->Add(prefix + "SetupBasicConfigTitle",

IDS_HOST_SETUP_BASIC_CONFIGURATION_TITLE);

builder->Add(prefix + "SetupNetworkErrorTitle",

IDS_HOST_SETUP_NETWORK_ERROR_TITLE);

+ builder->Add(prefix + "InitializationErrorTitle",

+ IDS_PAIRING_HOST_INITIALIZATION_ERROR_TITLE);

+ builder->Add(prefix + "ConnectionErrorTitle",

+ IDS_PAIRING_HOST_CONNECTION_ERROR_TITLE);

+ builder->Add(prefix + "ErrorNeedRestartText",

+ IDS_PAIRING_HOST_ERROR_NEED_RESTART_TEXT);

+ builder->Add(prefix + "ErrorNeedsRestart",

+ IDS_PAIRING_HOST_ERROR_NEED_RESTART_TEXT);

if (IsBootstrappingSlave()) {

builder->Add(prefix + "ConfirmationTitle", IDS_SLAVE_CONFIRMATION_TITLE);

@@ -91,8 +99,6 @@ void HostPairingScreenHandler::DeclareLocalizedValues(

builder->Add(prefix + "EnrollingTitle", IDS_SLAVE_ENROLLMENT_IN_PROGRESS);

builder->Add(prefix + "EnrollmentErrorTitle",

IDS_SLAVE_ENROLLMENT_ERROR_TITLE);

- builder->Add(prefix + "ErrorNeedsRestart",

- IDS_SLAVE_EROLLMENT_ERROR_NEEDS_RESTART);

}