Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Side by Side 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: User actions introduced. 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:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 screen->Initialize(nullptr /* context */); 295 screen->Initialize(nullptr /* context */);
296 return screen.release(); 296 return screen.release();
297 } else if (screen_name == kUserImageScreenName) { 297 } else if (screen_name == kUserImageScreenName) {
298 return new UserImageScreen(this, oobe_display_->GetUserImageView()); 298 return new UserImageScreen(this, oobe_display_->GetUserImageView());
299 } else if (screen_name == kEulaScreenName) { 299 } else if (screen_name == kEulaScreenName) {
300 return new EulaScreen(this, this, oobe_display_->GetEulaView()); 300 return new EulaScreen(this, this, oobe_display_->GetEulaView());
301 } else if (screen_name == kEnrollmentScreenName) { 301 } else if (screen_name == kEnrollmentScreenName) {
302 return new EnrollmentScreen(this, 302 return new EnrollmentScreen(this,
303 oobe_display_->GetEnrollmentScreenActor()); 303 oobe_display_->GetEnrollmentScreenActor());
304 } else if (screen_name == kResetScreenName) { 304 } else if (screen_name == kResetScreenName) {
305 return new ResetScreen(this, oobe_display_->GetResetScreenActor()); 305 return new chromeos::ResetScreen(this,
306 oobe_display_->GetResetView());
306 } else if (screen_name == kEnableDebuggingScreenName) { 307 } else if (screen_name == kEnableDebuggingScreenName) {
307 return new EnableDebuggingScreen( 308 return new EnableDebuggingScreen(
308 this, oobe_display_->GetEnableDebuggingScreenActor()); 309 this, oobe_display_->GetEnableDebuggingScreenActor());
309 } else if (screen_name == kKioskEnableScreenName) { 310 } else if (screen_name == kKioskEnableScreenName) {
310 return new KioskEnableScreen(this, 311 return new KioskEnableScreen(this,
311 oobe_display_->GetKioskEnableScreenActor()); 312 oobe_display_->GetKioskEnableScreenActor());
312 } else if (screen_name == kKioskAutolaunchScreenName) { 313 } else if (screen_name == kKioskAutolaunchScreenName) {
313 return new KioskAutolaunchScreen( 314 return new KioskAutolaunchScreen(
314 this, oobe_display_->GetKioskAutolaunchScreenActor()); 315 this, oobe_display_->GetKioskAutolaunchScreenActor());
315 } else if (screen_name == kTermsOfServiceScreenName) { 316 } else if (screen_name == kTermsOfServiceScreenName) {
(...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after
1293 } 1294 }
1294 1295
1295 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1296 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1296 screen->SetParameters(effective_config, shark_controller_.get(), 1297 screen->SetParameters(effective_config, shark_controller_.get(),
1297 remora_controller_.get()); 1298 remora_controller_.get());
1298 SetStatusAreaVisible(true); 1299 SetStatusAreaVisible(true);
1299 SetCurrentScreen(screen); 1300 SetCurrentScreen(screen);
1300 } 1301 }
1301 1302
1302 } // namespace chromeos 1303 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698