chrome/browser/chromeos/login/wizard_controller.cc - Issue 904163003: 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 904163003: Reset Screen moved to ScreenContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Include for GetNativeWindow added. 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 c914e0cbbb1f546251f1cfae30117a2f5701a4d3..c5225d2d5b222ac85d7a0a3289984d20dae24c03 100644

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

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

@@ -314,7 +314,8 @@ BaseScreen* WizardController::CreateScreen(const std::string& screen_name) {

return new EnrollmentScreen(this,

oobe_display_->GetEnrollmentScreenActor());

} else if (screen_name == kResetScreenName) {

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

+ return new chromeos::ResetScreen(this,

+ oobe_display_->GetResetView());

} else if (screen_name == kEnableDebuggingScreenName) {

return new EnableDebuggingScreen(

this, oobe_display_->GetEnableDebuggingScreenActor());