chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_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/arc_terms_of_service_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/arc_kiosk_splash_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_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/arc_terms_of_service_screen_handler.cc

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

index 9622daf2b4ce620f302003c32d496d2ca79a8806..2acd08bd72224a75dc0beed28bc25be8ed271530 100644

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

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

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

namespace chromeos {

-ArcTermsOfServiceScreenHandler::ArcTermsOfServiceScreenHandler() {

+ArcTermsOfServiceScreenHandler::ArcTermsOfServiceScreenHandler()

+ : BaseScreenHandler(kScreenId) {

set_call_js_prefix(kJsScreenPath);

}

@@ -159,7 +160,7 @@ void ArcTermsOfServiceScreenHandler::DoShow() {

system::TimezoneSettings::GetInstance()->AddObserver(this);

- ShowScreen(OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE);

+ ShowScreen(kScreenId);

UpdateTimeZone();

pref_handler_.reset(new arc::ArcOptInPreferenceHandler(