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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 928513002: 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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 screen->Initialize(nullptr /* context */); 307 screen->Initialize(nullptr /* context */);
308 return screen.release(); 308 return screen.release();
309 } else if (screen_name == kUserImageScreenName) { 309 } else if (screen_name == kUserImageScreenName) {
310 return new UserImageScreen(this, oobe_display_->GetUserImageView()); 310 return new UserImageScreen(this, oobe_display_->GetUserImageView());
311 } else if (screen_name == kEulaScreenName) { 311 } else if (screen_name == kEulaScreenName) {
312 return new EulaScreen(this, this, oobe_display_->GetEulaView()); 312 return new EulaScreen(this, this, oobe_display_->GetEulaView());
313 } else if (screen_name == kEnrollmentScreenName) { 313 } else if (screen_name == kEnrollmentScreenName) {
314 return new EnrollmentScreen(this, 314 return new EnrollmentScreen(this,
315 oobe_display_->GetEnrollmentScreenActor()); 315 oobe_display_->GetEnrollmentScreenActor());
316 } else if (screen_name == kResetScreenName) { 316 } else if (screen_name == kResetScreenName) {
317 return new chromeos::ResetScreen(this, 317 return new ResetScreen(this, oobe_display_->GetResetScreenActor());
318 oobe_display_->GetResetView());
319 } else if (screen_name == kEnableDebuggingScreenName) { 318 } else if (screen_name == kEnableDebuggingScreenName) {
320 return new EnableDebuggingScreen( 319 return new EnableDebuggingScreen(
321 this, oobe_display_->GetEnableDebuggingScreenActor()); 320 this, oobe_display_->GetEnableDebuggingScreenActor());
322 } else if (screen_name == kKioskEnableScreenName) { 321 } else if (screen_name == kKioskEnableScreenName) {
323 return new KioskEnableScreen(this, 322 return new KioskEnableScreen(this,
324 oobe_display_->GetKioskEnableScreenActor()); 323 oobe_display_->GetKioskEnableScreenActor());
325 } else if (screen_name == kKioskAutolaunchScreenName) { 324 } else if (screen_name == kKioskAutolaunchScreenName) {
326 return new KioskAutolaunchScreen( 325 return new KioskAutolaunchScreen(
327 this, oobe_display_->GetKioskAutolaunchScreenActor()); 326 this, oobe_display_->GetKioskAutolaunchScreenActor());
328 } else if (screen_name == kTermsOfServiceScreenName) { 327 } else if (screen_name == kTermsOfServiceScreenName) {
(...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after
1306 } 1305 }
1307 1306
1308 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1307 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1309 screen->SetParameters(effective_config, shark_controller_.get(), 1308 screen->SetParameters(effective_config, shark_controller_.get(),
1310 remora_controller_.get()); 1309 remora_controller_.get());
1311 SetStatusAreaVisible(true); 1310 SetStatusAreaVisible(true);
1312 SetCurrentScreen(screen); 1311 SetCurrentScreen(screen);
1313 } 1312 }
1314 1313
1315 } // namespace chromeos 1314 } // 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