chrome/browser/chromeos/login/enrollment/enrollment_screen.cc - Issue 647043004: WizardScreen is merged to BaseScreen.

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

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: Created 6 years, 2 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:

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

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

index 8281b857b6e146580c1baf5c124c41a7ec41c4c9..54d6e6d8e55a5fc226857882c8c7841ddcb88f8c 100644

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

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

@@ -52,10 +52,9 @@ EnrollmentScreen* EnrollmentScreen::Get(ScreenManager* manager) {

manager->GetScreen(WizardController::kEnrollmentScreenName));

}

-EnrollmentScreen::EnrollmentScreen(

- ScreenObserver* observer,

- EnrollmentScreenActor* actor)

- : WizardScreen(observer),

+EnrollmentScreen::EnrollmentScreen(ScreenObserver* observer,

+ EnrollmentScreenActor* actor)

+ : BaseScreen(observer),

shark_controller_(NULL),

remora_controller_(NULL),

actor_(actor),