chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc - Issue 2713513009: cros: Break BaseScreenHandler into two classes.

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 2713513009: cros: Break BaseScreenHandler into two classes. (Closed)

Patch Set: Add comments, fix compile Created 3 years, 10 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/ui/webui/chromeos/login/base_webui_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h » ('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 e77bfc9e668fe2bfb4807e892f1424d2218b0023..a2c7493c08e43bd3c4b54e8d50ddf24af87b840b 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

@@ -30,7 +30,8 @@ bool IsBootstrappingMaster() {

} // namespace

-ControllerPairingScreenHandler::ControllerPairingScreenHandler() {

+ControllerPairingScreenHandler::ControllerPairingScreenHandler()

+ : BaseScreenHandler(kScreenId) {

set_call_js_prefix(kJsScreenPath);

}

@@ -150,7 +151,7 @@ void ControllerPairingScreenHandler::Show() {

show_on_init_ = true;

return;

}

- ShowScreen(OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING);

+ ShowScreen(kScreenId);

}

void ControllerPairingScreenHandler::Hide() {