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

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

Issue 2633413002: cros: Remove BaseScreen::Initialize method. (Closed)
Patch Set: Created 3 years, 11 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 <stddef.h> 8 #include <stddef.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 } 355 }
356 356
357 BaseScreen* WizardController::GetScreen(OobeScreen screen) { 357 BaseScreen* WizardController::GetScreen(OobeScreen screen) {
358 if (screen == OobeScreen::SCREEN_ERROR_MESSAGE) 358 if (screen == OobeScreen::SCREEN_ERROR_MESSAGE)
359 return GetErrorScreen(); 359 return GetErrorScreen();
360 return ScreenManager::GetScreen(screen); 360 return ScreenManager::GetScreen(screen);
361 } 361 }
362 362
363 BaseScreen* WizardController::CreateScreen(OobeScreen screen) { 363 BaseScreen* WizardController::CreateScreen(OobeScreen screen) {
364 if (screen == OobeScreen::SCREEN_OOBE_NETWORK) { 364 if (screen == OobeScreen::SCREEN_OOBE_NETWORK) {
365 std::unique_ptr<NetworkScreen> screen( 365 return new NetworkScreen(this, this, oobe_ui_->GetNetworkView());
366 new NetworkScreen(this, this, oobe_ui_->GetNetworkView()));
367 screen->Initialize(nullptr /* context */);
368 return screen.release();
369 } else if (screen == OobeScreen::SCREEN_OOBE_UPDATE) { 366 } else if (screen == OobeScreen::SCREEN_OOBE_UPDATE) {
370 std::unique_ptr<UpdateScreen> screen(new UpdateScreen( 367 return new UpdateScreen(this, oobe_ui_->GetUpdateView(),
371 this, oobe_ui_->GetUpdateView(), remora_controller_.get())); 368 remora_controller_.get());
372 screen->Initialize(nullptr /* context */);
373 return screen.release();
374 } else if (screen == OobeScreen::SCREEN_USER_IMAGE_PICKER) { 369 } else if (screen == OobeScreen::SCREEN_USER_IMAGE_PICKER) {
375 return new UserImageScreen(this, oobe_ui_->GetUserImageView()); 370 return new UserImageScreen(this, oobe_ui_->GetUserImageView());
376 } else if (screen == OobeScreen::SCREEN_OOBE_EULA) { 371 } else if (screen == OobeScreen::SCREEN_OOBE_EULA) {
377 return new EulaScreen(this, this, oobe_ui_->GetEulaView()); 372 return new EulaScreen(this, this, oobe_ui_->GetEulaView());
378 } else if (screen == OobeScreen::SCREEN_OOBE_ENROLLMENT) { 373 } else if (screen == OobeScreen::SCREEN_OOBE_ENROLLMENT) {
379 return new EnrollmentScreen(this, oobe_ui_->GetEnrollmentScreenActor()); 374 return new EnrollmentScreen(this, oobe_ui_->GetEnrollmentScreenActor());
380 } else if (screen == OobeScreen::SCREEN_OOBE_RESET) { 375 } else if (screen == OobeScreen::SCREEN_OOBE_RESET) {
381 return new chromeos::ResetScreen(this, oobe_ui_->GetResetView()); 376 return new chromeos::ResetScreen(this, oobe_ui_->GetResetView());
382 } else if (screen == OobeScreen::SCREEN_OOBE_ENABLE_DEBUGGING) { 377 } else if (screen == OobeScreen::SCREEN_OOBE_ENABLE_DEBUGGING) {
383 return new EnableDebuggingScreen(this, 378 return new EnableDebuggingScreen(this,
384 oobe_ui_->GetEnableDebuggingScreenActor()); 379 oobe_ui_->GetEnableDebuggingScreenActor());
385 } else if (screen == OobeScreen::SCREEN_KIOSK_ENABLE) { 380 } else if (screen == OobeScreen::SCREEN_KIOSK_ENABLE) {
386 return new KioskEnableScreen(this, oobe_ui_->GetKioskEnableScreenActor()); 381 return new KioskEnableScreen(this, oobe_ui_->GetKioskEnableScreenActor());
387 } else if (screen == OobeScreen::SCREEN_KIOSK_AUTOLAUNCH) { 382 } else if (screen == OobeScreen::SCREEN_KIOSK_AUTOLAUNCH) {
388 return new KioskAutolaunchScreen(this, 383 return new KioskAutolaunchScreen(this,
389 oobe_ui_->GetKioskAutolaunchScreenActor()); 384 oobe_ui_->GetKioskAutolaunchScreenActor());
390 } else if (screen == OobeScreen::SCREEN_TERMS_OF_SERVICE) { 385 } else if (screen == OobeScreen::SCREEN_TERMS_OF_SERVICE) {
391 return new TermsOfServiceScreen(this, 386 return new TermsOfServiceScreen(this,
392 oobe_ui_->GetTermsOfServiceScreenActor()); 387 oobe_ui_->GetTermsOfServiceScreenActor());
393 } else if (screen == OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE) { 388 } else if (screen == OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE) {
394 return new ArcTermsOfServiceScreen( 389 return new ArcTermsOfServiceScreen(
395 this, oobe_ui_->GetArcTermsOfServiceScreenActor()); 390 this, oobe_ui_->GetArcTermsOfServiceScreenActor());
396 } else if (screen == OobeScreen::SCREEN_WRONG_HWID) { 391 } else if (screen == OobeScreen::SCREEN_WRONG_HWID) {
397 return new WrongHWIDScreen(this, oobe_ui_->GetWrongHWIDScreenActor()); 392 return new WrongHWIDScreen(this, oobe_ui_->GetWrongHWIDScreenActor());
398 } else if (screen == OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW) { 393 } else if (screen == OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW) {
399 return new SupervisedUserCreationScreen( 394 return new SupervisedUserCreationScreen(
400 this, oobe_ui_->GetSupervisedUserCreationScreenActor()); 395 this, oobe_ui_->GetSupervisedUserCreationScreenActor());
401 } else if (screen == OobeScreen::SCREEN_OOBE_HID_DETECTION) { 396 } else if (screen == OobeScreen::SCREEN_OOBE_HID_DETECTION) {
402 std::unique_ptr<HIDDetectionScreen> screen(new chromeos::HIDDetectionScreen( 397 return new chromeos::HIDDetectionScreen(this,
403 this, oobe_ui_->GetHIDDetectionView())); 398 oobe_ui_->GetHIDDetectionView());
404 screen->Initialize(nullptr /* context */);
405 return screen.release();
406 } else if (screen == OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK) { 399 } else if (screen == OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK) {
407 return new AutoEnrollmentCheckScreen( 400 return new AutoEnrollmentCheckScreen(
408 this, oobe_ui_->GetAutoEnrollmentCheckScreenActor()); 401 this, oobe_ui_->GetAutoEnrollmentCheckScreenActor());
409 } else if (screen == OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING) { 402 } else if (screen == OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING) {
410 if (!shark_controller_) { 403 if (!shark_controller_) {
411 shark_controller_.reset( 404 shark_controller_.reset(
412 new pairing_chromeos::BluetoothControllerPairingController()); 405 new pairing_chromeos::BluetoothControllerPairingController());
413 } 406 }
414 return new ControllerPairingScreen( 407 return new ControllerPairingScreen(
415 this, this, oobe_ui_->GetControllerPairingScreenActor(), 408 this, this, oobe_ui_->GetControllerPairingScreenActor(),
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1492 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1500 } 1493 }
1501 1494
1502 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1495 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1503 screen->SetParameters(effective_config, shark_controller_.get()); 1496 screen->SetParameters(effective_config, shark_controller_.get());
1504 SetStatusAreaVisible(true); 1497 SetStatusAreaVisible(true);
1505 SetCurrentScreen(screen); 1498 SetCurrentScreen(screen);
1506 } 1499 }
1507 1500
1508 } // namespace chromeos 1501 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/update_screen.cc ('k') | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698