chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc - Issue 2549373005: cros: Refactor of BaseScreen::GetName to BaseScreen::screen_id.

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

Issue 2549373005: cros: Refactor of BaseScreen::GetName to BaseScreen::screen_id. (Closed)

Patch Set: Nits Created 3 years, 11 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/chromeos/login/enrollment/auto_enrollment_check_screen.h ('k') | chrome/browser/chromeos/login/enrollment/enrollment_screen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc

diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc

index 0b031e867b458c87bd39b20c328f2be83f084d64..7aa154e2561307944e7908e0ee2b86e9da1db668 100644

--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc

+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc

@@ -47,7 +47,8 @@ AutoEnrollmentCheckScreen* AutoEnrollmentCheckScreen::Get(

AutoEnrollmentCheckScreen::AutoEnrollmentCheckScreen(

BaseScreenDelegate* base_screen_delegate,

AutoEnrollmentCheckScreenActor* actor)

- : BaseScreen(base_screen_delegate),

+ : BaseScreen(base_screen_delegate,

+ WizardController::kAutoEnrollmentCheckScreenName),

actor_(actor),

auto_enrollment_controller_(nullptr),

captive_portal_status_(

@@ -120,10 +121,6 @@ void AutoEnrollmentCheckScreen::Show() {

void AutoEnrollmentCheckScreen::Hide() {

}

-std::string AutoEnrollmentCheckScreen::GetName() const {

- return WizardController::kAutoEnrollmentCheckScreenName;

void AutoEnrollmentCheckScreen::OnActorDestroyed(

AutoEnrollmentCheckScreenActor* actor) {

if (actor_ == actor)