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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ui/webui/chromeos/login/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/ui/ash/ash_util.h" 31 #include "chrome/browser/ui/ash/ash_util.h"
32 #include "chrome/browser/ui/webui/about_ui.h" 32 #include "chrome/browser/ui/webui/about_ui.h"
33 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h" 33 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"
34 #include "chrome/browser/ui/webui/chromeos/login/arc_kiosk_splash_screen_handler .h" 34 #include "chrome/browser/ui/webui/chromeos/login/arc_kiosk_splash_screen_handler .h"
35 #include "chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_han dler.h" 35 #include "chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_han dler.h"
36 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha ndler.h" 36 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha ndler.h"
37 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" 37 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
38 #include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handl er.h" 38 #include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handl er.h"
39 #include "chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler. h" 39 #include "chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler. h"
40 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h" 40 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h"
41 #include "chrome/browser/ui/webui/chromeos/login/encryption_migration_screen_han dler.h"
41 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h" 42 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
42 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" 43 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
43 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h" 44 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
44 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" 45 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
45 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 46 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
46 #include "chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h" 47 #include "chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h"
47 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h" 48 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
48 #include "chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler .h" 49 #include "chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler .h"
49 #include "chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h" 50 #include "chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h"
50 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h" 51 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 AddScreenHandler(base::MakeUnique<ArcKioskSplashScreenHandler>()); 285 AddScreenHandler(base::MakeUnique<ArcKioskSplashScreenHandler>());
285 286
286 if (display_type_ == kOobeDisplay) { 287 if (display_type_ == kOobeDisplay) {
287 AddScreenHandler(base::MakeUnique<ControllerPairingScreenHandler>()); 288 AddScreenHandler(base::MakeUnique<ControllerPairingScreenHandler>());
288 289
289 AddScreenHandler(base::MakeUnique<HostPairingScreenHandler>()); 290 AddScreenHandler(base::MakeUnique<HostPairingScreenHandler>());
290 } 291 }
291 292
292 AddScreenHandler(base::MakeUnique<DeviceDisabledScreenHandler>()); 293 AddScreenHandler(base::MakeUnique<DeviceDisabledScreenHandler>());
293 294
295 AddScreenHandler(base::MakeUnique<EncryptionMigrationScreenHandler>());
296
294 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler. 297 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler.
295 auto kiosk_app_menu_handler = 298 auto kiosk_app_menu_handler =
296 base::MakeUnique<KioskAppMenuHandler>(network_state_informer_); 299 base::MakeUnique<KioskAppMenuHandler>(network_state_informer_);
297 kiosk_app_menu_handler_ = kiosk_app_menu_handler.get(); 300 kiosk_app_menu_handler_ = kiosk_app_menu_handler.get();
298 web_ui->AddMessageHandler(std::move(kiosk_app_menu_handler)); 301 web_ui->AddMessageHandler(std::move(kiosk_app_menu_handler));
299 302
300 base::DictionaryValue localized_strings; 303 base::DictionaryValue localized_strings;
301 GetLocalizedStrings(&localized_strings); 304 GetLocalizedStrings(&localized_strings);
302 305
303 Profile* profile = Profile::FromWebUI(web_ui); 306 Profile* profile = Profile::FromWebUI(web_ui);
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 } 399 }
397 400
398 HostPairingScreenView* OobeUI::GetHostPairingScreenView() { 401 HostPairingScreenView* OobeUI::GetHostPairingScreenView() {
399 return GetView<HostPairingScreenHandler>(); 402 return GetView<HostPairingScreenHandler>();
400 } 403 }
401 404
402 DeviceDisabledScreenView* OobeUI::GetDeviceDisabledScreenView() { 405 DeviceDisabledScreenView* OobeUI::GetDeviceDisabledScreenView() {
403 return GetView<DeviceDisabledScreenHandler>(); 406 return GetView<DeviceDisabledScreenHandler>();
404 } 407 }
405 408
409 EncryptionMigrationScreenView* OobeUI::GetEncryptionMigrationScreenView() {
410 return GetView<EncryptionMigrationScreenHandler>();
411 }
412
406 UserImageView* OobeUI::GetUserImageView() { 413 UserImageView* OobeUI::GetUserImageView() {
407 return GetView<UserImageScreenHandler>(); 414 return GetView<UserImageScreenHandler>();
408 } 415 }
409 416
410 ErrorScreen* OobeUI::GetErrorScreen() { 417 ErrorScreen* OobeUI::GetErrorScreen() {
411 return error_screen_.get(); 418 return error_screen_.get();
412 } 419 }
413 420
414 SupervisedUserCreationScreenHandler* 421 SupervisedUserCreationScreenHandler*
415 OobeUI::GetSupervisedUserCreationScreenView() { 422 OobeUI::GetSupervisedUserCreationScreenView() {
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode)) { 592 g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode)) {
586 return; 593 return;
587 } 594 }
588 595
589 base::DictionaryValue localized_strings; 596 base::DictionaryValue localized_strings;
590 GetLocalizedStrings(&localized_strings); 597 GetLocalizedStrings(&localized_strings);
591 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings); 598 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings);
592 } 599 }
593 600
594 } // namespace chromeos 601 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698