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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 2947483002: Create OOBE screen for Waiting for Container ready (Closed)
Patch Set: Rebase and run js format Created 3 years, 6 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 6389ac8e26b9e8b100128c7928a2ac5f0946c35c..da28bd5e1a54a6ec964c5cac4e0bfe95dca7c642 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -55,6 +55,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"
@@ -436,6 +437,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;
@@ -644,6 +648,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.";
@@ -855,8 +865,12 @@ void WizardController::OnVoiceInteractionValuePropAccepted() {
ShowArcTermsOfServiceScreen();
return;
}
- StartVoiceInteractionSetupWizard();
+ ShowWaitForContainerReadyScreen();
+}
+
+void WizardController::OnWaitForContainerReadyFinished() {
OnOobeFlowFinished();
+ StartVoiceInteractionSetupWizard();
}
void WizardController::OnControllerPairingFinished() {
@@ -1124,6 +1138,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();
@@ -1238,6 +1254,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();
}
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698