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

Side by Side 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:
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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 screen->Initialize(nullptr /* context */); 302 screen->Initialize(nullptr /* context */);
303 return screen.release(); 303 return screen.release();
304 } else if (screen_name == kUserImageScreenName) { 304 } else if (screen_name == kUserImageScreenName) {
305 return new UserImageScreen(this, oobe_display_->GetUserImageView()); 305 return new UserImageScreen(this, oobe_display_->GetUserImageView());
306 } else if (screen_name == kEulaScreenName) { 306 } else if (screen_name == kEulaScreenName) {
307 return new EulaScreen(this, this, oobe_display_->GetEulaView()); 307 return new EulaScreen(this, this, oobe_display_->GetEulaView());
308 } else if (screen_name == kEnrollmentScreenName) { 308 } else if (screen_name == kEnrollmentScreenName) {
309 return new EnrollmentScreen(this, 309 return new EnrollmentScreen(this,
310 oobe_display_->GetEnrollmentScreenActor()); 310 oobe_display_->GetEnrollmentScreenActor());
311 } else if (screen_name == kResetScreenName) { 311 } else if (screen_name == kResetScreenName) {
312 return new chromeos::ResetScreen(this, 312 return new ResetScreen(this, oobe_display_->GetResetScreenActor());
313 oobe_display_->GetResetView());
314 } else if (screen_name == kEnableDebuggingScreenName) { 313 } else if (screen_name == kEnableDebuggingScreenName) {
315 return new EnableDebuggingScreen( 314 return new EnableDebuggingScreen(
316 this, oobe_display_->GetEnableDebuggingScreenActor()); 315 this, oobe_display_->GetEnableDebuggingScreenActor());
317 } else if (screen_name == kKioskEnableScreenName) { 316 } else if (screen_name == kKioskEnableScreenName) {
318 return new KioskEnableScreen(this, 317 return new KioskEnableScreen(this,
319 oobe_display_->GetKioskEnableScreenActor()); 318 oobe_display_->GetKioskEnableScreenActor());
320 } else if (screen_name == kKioskAutolaunchScreenName) { 319 } else if (screen_name == kKioskAutolaunchScreenName) {
321 return new KioskAutolaunchScreen( 320 return new KioskAutolaunchScreen(
322 this, oobe_display_->GetKioskAutolaunchScreenActor()); 321 this, oobe_display_->GetKioskAutolaunchScreenActor());
323 } else if (screen_name == kTermsOfServiceScreenName) { 322 } else if (screen_name == kTermsOfServiceScreenName) {
(...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 } 1300 }
1302 1301
1303 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1302 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1304 screen->SetParameters(effective_config, shark_controller_.get(), 1303 screen->SetParameters(effective_config, shark_controller_.get(),
1305 remora_controller_.get()); 1304 remora_controller_.get());
1306 SetStatusAreaVisible(true); 1305 SetStatusAreaVisible(true);
1307 SetCurrentScreen(screen); 1306 SetCurrentScreen(screen);
1308 } 1307 }
1309 1308
1310 } // namespace chromeos 1309 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | chrome/browser/resources/chromeos/login/oobe_screen_reset.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698