chrome/browser/ui/webui/chromeos/login/kiosk_enable_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/kiosk_enable_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/kiosk_autolaunch_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f2c86d7d1b7ce4214da8f57d8f99fca321b117bd..16d9eb7ce6933e1df5f224295f1c8569b97a78be 100644

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

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

@@ -24,7 +24,8 @@ const char kJsScreenPath[] = "login.KioskEnableScreen";

namespace chromeos {

-KioskEnableScreenHandler::KioskEnableScreenHandler() : weak_ptr_factory_(this) {

+KioskEnableScreenHandler::KioskEnableScreenHandler()

+ : BaseScreenHandler(kScreenId), weak_ptr_factory_(this) {

set_call_js_prefix(kJsScreenPath);

}

@@ -54,7 +55,7 @@ void KioskEnableScreenHandler::OnGetConsumerKioskAutoLaunchStatus(

return;

}

- ShowScreen(OobeScreen::SCREEN_KIOSK_ENABLE);

+ ShowScreen(kScreenId);

content::NotificationService::current()->Notify(

chrome::NOTIFICATION_KIOSK_ENABLE_WARNING_VISIBLE,