OLD | NEW |
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 Loading... |
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 ResetScreen(this, oobe_display_->GetResetScreenActor()); | 317 return new chromeos::ResetScreen(this, |
| 318 oobe_display_->GetResetView()); |
318 } else if (screen_name == kEnableDebuggingScreenName) { | 319 } else if (screen_name == kEnableDebuggingScreenName) { |
319 return new EnableDebuggingScreen( | 320 return new EnableDebuggingScreen( |
320 this, oobe_display_->GetEnableDebuggingScreenActor()); | 321 this, oobe_display_->GetEnableDebuggingScreenActor()); |
321 } else if (screen_name == kKioskEnableScreenName) { | 322 } else if (screen_name == kKioskEnableScreenName) { |
322 return new KioskEnableScreen(this, | 323 return new KioskEnableScreen(this, |
323 oobe_display_->GetKioskEnableScreenActor()); | 324 oobe_display_->GetKioskEnableScreenActor()); |
324 } else if (screen_name == kKioskAutolaunchScreenName) { | 325 } else if (screen_name == kKioskAutolaunchScreenName) { |
325 return new KioskAutolaunchScreen( | 326 return new KioskAutolaunchScreen( |
326 this, oobe_display_->GetKioskAutolaunchScreenActor()); | 327 this, oobe_display_->GetKioskAutolaunchScreenActor()); |
327 } else if (screen_name == kTermsOfServiceScreenName) { | 328 } else if (screen_name == kTermsOfServiceScreenName) { |
(...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1305 } | 1306 } |
1306 | 1307 |
1307 EnrollmentScreen* screen = EnrollmentScreen::Get(this); | 1308 EnrollmentScreen* screen = EnrollmentScreen::Get(this); |
1308 screen->SetParameters(effective_config, shark_controller_.get(), | 1309 screen->SetParameters(effective_config, shark_controller_.get(), |
1309 remora_controller_.get()); | 1310 remora_controller_.get()); |
1310 SetStatusAreaVisible(true); | 1311 SetStatusAreaVisible(true); |
1311 SetCurrentScreen(screen); | 1312 SetCurrentScreen(screen); |
1312 } | 1313 } |
1313 | 1314 |
1314 } // namespace chromeos | 1315 } // namespace chromeos |
OLD | NEW |