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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 2779933002: Add a screen to migrate filesystem encryption from eCryptfs to ext4 crypto. (Closed)
Patch Set: Address review comments. Created 3 years, 8 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 unified diff | Download patch
OLDNEW
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 <stddef.h> 8 #include <stddef.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/chromeos/arc/arc_util.h" 31 #include "chrome/browser/chromeos/arc/arc_util.h"
32 #include "chrome/browser/chromeos/customization/customization_document.h" 32 #include "chrome/browser/chromeos/customization/customization_document.h"
33 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h" 33 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h"
34 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" 34 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
35 #include "chrome/browser/chromeos/login/existing_user_controller.h" 35 #include "chrome/browser/chromeos/login/existing_user_controller.h"
36 #include "chrome/browser/chromeos/login/helper.h" 36 #include "chrome/browser/chromeos/login/helper.h"
37 #include "chrome/browser/chromeos/login/hwid_checker.h" 37 #include "chrome/browser/chromeos/login/hwid_checker.h"
38 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h" 38 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h"
39 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h" 39 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
40 #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h" 40 #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h"
41 #include "chrome/browser/chromeos/login/screens/encryption_migration_screen.h"
41 #include "chrome/browser/chromeos/login/screens/error_screen.h" 42 #include "chrome/browser/chromeos/login/screens/error_screen.h"
42 #include "chrome/browser/chromeos/login/screens/eula_screen.h" 43 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
43 #include "chrome/browser/chromeos/login/screens/hid_detection_view.h" 44 #include "chrome/browser/chromeos/login/screens/hid_detection_view.h"
44 #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h" 45 #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h"
45 #include "chrome/browser/chromeos/login/screens/kiosk_enable_screen.h" 46 #include "chrome/browser/chromeos/login/screens/kiosk_enable_screen.h"
46 #include "chrome/browser/chromeos/login/screens/network_error.h" 47 #include "chrome/browser/chromeos/login/screens/network_error.h"
47 #include "chrome/browser/chromeos/login/screens/network_view.h" 48 #include "chrome/browser/chromeos/login/screens/network_view.h"
48 #include "chrome/browser/chromeos/login/screens/reset_screen.h" 49 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
49 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h" 50 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h"
50 #include "chrome/browser/chromeos/login/screens/update_screen.h" 51 #include "chrome/browser/chromeos/login/screens/update_screen.h"
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 new pairing_chromeos::BluetoothHostPairingController( 419 new pairing_chromeos::BluetoothHostPairingController(
419 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE))); 420 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)));
420 remora_controller_->StartPairing(); 421 remora_controller_->StartPairing();
421 } 422 }
422 return new HostPairingScreen(this, this, 423 return new HostPairingScreen(this, this,
423 oobe_ui_->GetHostPairingScreenView(), 424 oobe_ui_->GetHostPairingScreenView(),
424 remora_controller_.get()); 425 remora_controller_.get());
425 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) { 426 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) {
426 return new DeviceDisabledScreen(this, 427 return new DeviceDisabledScreen(this,
427 oobe_ui_->GetDeviceDisabledScreenView()); 428 oobe_ui_->GetDeviceDisabledScreenView());
429 } else if (screen == OobeScreen::SCREEN_ENCRYPTION_MIGRATION) {
430 return new EncryptionMigrationScreen(
431 this, oobe_ui_->GetEncryptionMigrationScreenView());
428 } 432 }
429 433
430 return nullptr; 434 return nullptr;
431 } 435 }
432 436
433 void WizardController::ShowNetworkScreen() { 437 void WizardController::ShowNetworkScreen() {
434 VLOG(1) << "Showing network screen."; 438 VLOG(1) << "Showing network screen.";
435 // Hide the status area initially; it only appears after OOBE first animates 439 // Hide the status area initially; it only appears after OOBE first animates
436 // in. Keep it visible if the user goes back to the existing network screen. 440 // in. Keep it visible if the user goes back to the existing network screen.
437 SetStatusAreaVisible( 441 SetStatusAreaVisible(
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 SetStatusAreaVisible(false); 632 SetStatusAreaVisible(false);
629 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_OOBE_HOST_PAIRING)); 633 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_OOBE_HOST_PAIRING));
630 } 634 }
631 635
632 void WizardController::ShowDeviceDisabledScreen() { 636 void WizardController::ShowDeviceDisabledScreen() {
633 VLOG(1) << "Showing device disabled screen."; 637 VLOG(1) << "Showing device disabled screen.";
634 SetStatusAreaVisible(true); 638 SetStatusAreaVisible(true);
635 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_DEVICE_DISABLED)); 639 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_DEVICE_DISABLED));
636 } 640 }
637 641
642 void WizardController::ShowEncryptionMigrationScreen() {
643 VLOG(1) << "Showing encryption migration screen.";
644 SetStatusAreaVisible(true);
645 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_ENCRYPTION_MIGRATION));
646 }
647
638 void WizardController::SkipToLoginForTesting( 648 void WizardController::SkipToLoginForTesting(
639 const LoginScreenContext& context) { 649 const LoginScreenContext& context) {
640 VLOG(1) << "SkipToLoginForTesting."; 650 VLOG(1) << "SkipToLoginForTesting.";
641 StartupUtils::MarkEulaAccepted(); 651 StartupUtils::MarkEulaAccepted();
642 PerformPostEulaActions(); 652 PerformPostEulaActions();
643 OnDeviceDisabledChecked(false /* device_disabled */); 653 OnDeviceDisabledChecked(false /* device_disabled */);
644 } 654 }
645 655
646 pairing_chromeos::SharkConnectionListener* 656 pairing_chromeos::SharkConnectionListener*
647 WizardController::GetSharkConnectionListenerForTesting() { 657 WizardController::GetSharkConnectionListenerForTesting() {
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 } else if (screen == OobeScreen::SCREEN_ARC_KIOSK_SPLASH) { 1069 } else if (screen == OobeScreen::SCREEN_ARC_KIOSK_SPLASH) {
1060 ShowArcKioskSplashScreen(); 1070 ShowArcKioskSplashScreen();
1061 } else if (screen == OobeScreen::SCREEN_OOBE_HID_DETECTION) { 1071 } else if (screen == OobeScreen::SCREEN_OOBE_HID_DETECTION) {
1062 ShowHIDDetectionScreen(); 1072 ShowHIDDetectionScreen();
1063 } else if (screen == OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING) { 1073 } else if (screen == OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING) {
1064 ShowControllerPairingScreen(); 1074 ShowControllerPairingScreen();
1065 } else if (screen == OobeScreen::SCREEN_OOBE_HOST_PAIRING) { 1075 } else if (screen == OobeScreen::SCREEN_OOBE_HOST_PAIRING) {
1066 ShowHostPairingScreen(); 1076 ShowHostPairingScreen();
1067 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) { 1077 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) {
1068 ShowDeviceDisabledScreen(); 1078 ShowDeviceDisabledScreen();
1079 } else if (screen == OobeScreen::SCREEN_ENCRYPTION_MIGRATION) {
1080 ShowEncryptionMigrationScreen();
1069 } else if (screen != OobeScreen::SCREEN_TEST_NO_WINDOW) { 1081 } else if (screen != OobeScreen::SCREEN_TEST_NO_WINDOW) {
1070 if (is_out_of_box_) { 1082 if (is_out_of_box_) {
1071 time_oobe_started_ = base::Time::Now(); 1083 time_oobe_started_ = base::Time::Now();
1072 if (IsRemoraPairingOobe() || IsControllerDetected()) { 1084 if (IsRemoraPairingOobe() || IsControllerDetected()) {
1073 ShowHostPairingScreen(); 1085 ShowHostPairingScreen();
1074 } else if (CanShowHIDDetectionScreen()) { 1086 } else if (CanShowHIDDetectionScreen()) {
1075 hid_screen_ = GetScreen(OobeScreen::SCREEN_OOBE_HID_DETECTION); 1087 hid_screen_ = GetScreen(OobeScreen::SCREEN_OOBE_HID_DETECTION);
1076 base::Callback<void(bool)> on_check = base::Bind( 1088 base::Callback<void(bool)> on_check = base::Bind(
1077 &WizardController::OnHIDScreenNecessityCheck, 1089 &WizardController::OnHIDScreenNecessityCheck,
1078 weak_factory_.GetWeakPtr()); 1090 weak_factory_.GetWeakPtr());
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1524 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1513 } 1525 }
1514 1526
1515 EnrollmentScreen* screen = EnrollmentScreen::Get(screen_manager()); 1527 EnrollmentScreen* screen = EnrollmentScreen::Get(screen_manager());
1516 screen->SetParameters(effective_config, shark_controller_.get()); 1528 screen->SetParameters(effective_config, shark_controller_.get());
1517 SetStatusAreaVisible(true); 1529 SetStatusAreaVisible(true);
1518 SetCurrentScreen(screen); 1530 SetCurrentScreen(screen);
1519 } 1531 }
1520 1532
1521 } // namespace chromeos 1533 } // namespace chromeos
OLDNEW
« 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