| 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 f775eefa694336e36a0a0da73e022e63f543ed87..f82b0a8485872f5ca31b5f2d68ab023b25a5d847 100644
|
| --- a/chrome/browser/chromeos/login/wizard_controller.cc
|
| +++ b/chrome/browser/chromeos/login/wizard_controller.cc
|
| @@ -54,6 +54,7 @@
|
| #include "chrome/browser/chromeos/login/screens/update_screen.h"
|
| #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
|
| #include "chrome/browser/chromeos/login/screens/voice_interaction_value_prop_screen.h"
|
| +#include "chrome/browser/chromeos/login/screens/wait_for_container_ready_screen.h"
|
| #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
|
| #include "chrome/browser/chromeos/login/session/user_session_manager.h"
|
| #include "chrome/browser/chromeos/login/startup_utils.h"
|
| @@ -435,6 +436,9 @@ BaseScreen* WizardController::CreateScreen(OobeScreen screen) {
|
| } else if (screen == OobeScreen::SCREEN_VOICE_INTERACTION_VALUE_PROP) {
|
| return new VoiceInteractionValuePropScreen(
|
| this, oobe_ui_->GetVoiceInteractionValuePropScreenView());
|
| + } else if (screen == OobeScreen::SCREEN_WAIT_FOR_CONTAINER_READY) {
|
| + return new WaitForContainerReadyScreen(
|
| + this, oobe_ui_->GetWaitForContainerReadyScreenView());
|
| }
|
|
|
| return nullptr;
|
| @@ -643,6 +647,12 @@ void WizardController::ShowVoiceInteractionValuePropScreen() {
|
| }
|
| }
|
|
|
| +void WizardController::ShowWaitForContainerReadyScreen() {
|
| + UpdateStatusAreaVisibilityForScreen(
|
| + OobeScreen::SCREEN_WAIT_FOR_CONTAINER_READY);
|
| + SetCurrentScreen(GetScreen(OobeScreen::SCREEN_WAIT_FOR_CONTAINER_READY));
|
| +}
|
| +
|
| void WizardController::SkipToLoginForTesting(
|
| const LoginScreenContext& context) {
|
| VLOG(1) << "SkipToLoginForTesting.";
|
| @@ -854,8 +864,12 @@ void WizardController::OnVoiceInteractionValuePropAccepted() {
|
| ShowArcTermsOfServiceScreen();
|
| return;
|
| }
|
| - StartVoiceInteractionSetupWizard();
|
| + ShowWaitForContainerReadyScreen();
|
| +}
|
| +
|
| +void WizardController::OnWaitForContainerReadyFinished() {
|
| OnOobeFlowFinished();
|
| + StartVoiceInteractionSetupWizard();
|
| }
|
|
|
| void WizardController::OnControllerPairingFinished() {
|
| @@ -1123,6 +1137,8 @@ void WizardController::AdvanceToScreen(OobeScreen screen) {
|
| ShowEncryptionMigrationScreen();
|
| } else if (screen == OobeScreen::SCREEN_VOICE_INTERACTION_VALUE_PROP) {
|
| ShowVoiceInteractionValuePropScreen();
|
| + } else if (screen == OobeScreen::SCREEN_WAIT_FOR_CONTAINER_READY) {
|
| + ShowWaitForContainerReadyScreen();
|
| } else if (screen != OobeScreen::SCREEN_TEST_NO_WINDOW) {
|
| if (is_out_of_box_) {
|
| time_oobe_started_ = base::Time::Now();
|
| @@ -1237,6 +1253,9 @@ void WizardController::OnExit(BaseScreen& /* screen */,
|
| case ScreenExitCode::VOICE_INTERACTION_VALUE_PROP_ACCEPTED:
|
| OnVoiceInteractionValuePropAccepted();
|
| break;
|
| + case ScreenExitCode::WAIT_FOR_CONTAINER_READY_FINISHED:
|
| + OnWaitForContainerReadyFinished();
|
| + break;
|
| default:
|
| NOTREACHED();
|
| }
|
|
|