| 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 f47b9b764942cc57805bd070cf08696ce312edef..f62a8cf41c0ac511fda450d1e08f6d7b8a0d3fdb 100644
|
| --- a/chrome/browser/chromeos/login/wizard_controller.cc
|
| +++ b/chrome/browser/chromeos/login/wizard_controller.cc
|
| @@ -38,6 +38,7 @@
|
| #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h"
|
| #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
|
| #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h"
|
| +#include "chrome/browser/chromeos/login/screens/encryption_migration_screen.h"
|
| #include "chrome/browser/chromeos/login/screens/error_screen.h"
|
| #include "chrome/browser/chromeos/login/screens/eula_screen.h"
|
| #include "chrome/browser/chromeos/login/screens/hid_detection_view.h"
|
| @@ -425,6 +426,9 @@ BaseScreen* WizardController::CreateScreen(OobeScreen screen) {
|
| } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) {
|
| return new DeviceDisabledScreen(this,
|
| oobe_ui_->GetDeviceDisabledScreenView());
|
| + } else if (screen == OobeScreen::SCREEN_ENCRYPTION_MIGRATION) {
|
| + return new EncryptionMigrationScreen(
|
| + this, oobe_ui_->GetEncryptionMigrationScreenView());
|
| }
|
|
|
| return nullptr;
|
| @@ -635,6 +639,12 @@ void WizardController::ShowDeviceDisabledScreen() {
|
| SetCurrentScreen(GetScreen(OobeScreen::SCREEN_DEVICE_DISABLED));
|
| }
|
|
|
| +void WizardController::ShowEncryptionMigrationScreen() {
|
| + VLOG(1) << "Showing encryption migration screen.";
|
| + SetStatusAreaVisible(true);
|
| + SetCurrentScreen(GetScreen(OobeScreen::SCREEN_ENCRYPTION_MIGRATION));
|
| +}
|
| +
|
| void WizardController::SkipToLoginForTesting(
|
| const LoginScreenContext& context) {
|
| VLOG(1) << "SkipToLoginForTesting.";
|
| @@ -1066,6 +1076,8 @@ void WizardController::AdvanceToScreen(OobeScreen screen) {
|
| ShowHostPairingScreen();
|
| } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) {
|
| ShowDeviceDisabledScreen();
|
| + } else if (screen == OobeScreen::SCREEN_ENCRYPTION_MIGRATION) {
|
| + ShowEncryptionMigrationScreen();
|
| } else if (screen != OobeScreen::SCREEN_TEST_NO_WINDOW) {
|
| if (is_out_of_box_) {
|
| time_oobe_started_ = base::Time::Now();
|
|
|