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

Unified 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 side-by-side diff with in-line comments
Download patch
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 55a45f9b271a8b2c2e9b229304e9aea38c182be3..b4ad845ac1a7ee377fa3d7d3c13933c61d43d93c 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -362,15 +362,10 @@ BaseScreen* WizardController::GetScreen(OobeScreen screen) {
BaseScreen* WizardController::CreateScreen(OobeScreen screen) {
if (screen == OobeScreen::SCREEN_OOBE_NETWORK) {
- std::unique_ptr<NetworkScreen> screen(
- new NetworkScreen(this, this, oobe_ui_->GetNetworkView()));
- screen->Initialize(nullptr /* context */);
- return screen.release();
+ return new NetworkScreen(this, this, oobe_ui_->GetNetworkView());
} else if (screen == OobeScreen::SCREEN_OOBE_UPDATE) {
- std::unique_ptr<UpdateScreen> screen(new UpdateScreen(
- this, oobe_ui_->GetUpdateView(), remora_controller_.get()));
- screen->Initialize(nullptr /* context */);
- return screen.release();
+ return new UpdateScreen(this, oobe_ui_->GetUpdateView(),
+ remora_controller_.get());
} else if (screen == OobeScreen::SCREEN_USER_IMAGE_PICKER) {
return new UserImageScreen(this, oobe_ui_->GetUserImageView());
} else if (screen == OobeScreen::SCREEN_OOBE_EULA) {
@@ -399,10 +394,8 @@ BaseScreen* WizardController::CreateScreen(OobeScreen screen) {
return new SupervisedUserCreationScreen(
this, oobe_ui_->GetSupervisedUserCreationScreenActor());
} else if (screen == OobeScreen::SCREEN_OOBE_HID_DETECTION) {
- std::unique_ptr<HIDDetectionScreen> screen(new chromeos::HIDDetectionScreen(
- this, oobe_ui_->GetHIDDetectionView()));
- screen->Initialize(nullptr /* context */);
- return screen.release();
+ return new chromeos::HIDDetectionScreen(this,
+ oobe_ui_->GetHIDDetectionView());
} else if (screen == OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK) {
return new AutoEnrollmentCheckScreen(
this, oobe_ui_->GetAutoEnrollmentCheckScreenActor());
« 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