chrome/browser/chromeos/login/wizard_controller.cc - Issue 917613005: Revert of Reset Screen moved to ScreenContext.

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

Issue 917613005: Revert of Reset Screen moved to ScreenContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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:

Index: chrome/browser/chromeos/login/wizard_controller.cc

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

index 02a883200952fb77a15fea62e5e2a1e8bfbf6901..f934e870adc11950033ddbdfd5f63ba05ed2636d 100644

--- a/chrome/browser/chromeos/login/wizard_controller.cc

+++ b/chrome/browser/chromeos/login/wizard_controller.cc

@@ -309,8 +309,7 @@

return new EnrollmentScreen(this,

oobe_display_->GetEnrollmentScreenActor());

} else if (screen_name == kResetScreenName) {

- return new chromeos::ResetScreen(this,

- oobe_display_->GetResetView());

+ return new ResetScreen(this, oobe_display_->GetResetScreenActor());

} else if (screen_name == kEnableDebuggingScreenName) {

return new EnableDebuggingScreen(

this, oobe_display_->GetEnableDebuggingScreenActor());