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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.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 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/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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 53 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
54 #include "chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.h" 54 #include "chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.h"
55 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 55 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
56 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 56 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
57 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen _handler.h" 57 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen _handler.h"
58 #include "chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler .h" 58 #include "chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler .h"
59 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h" 59 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
60 #include "chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h" 60 #include "chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h"
61 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h" 61 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
62 #include "chrome/browser/ui/webui/chromeos/login/voice_interaction_value_prop_sc reen_handler.h" 62 #include "chrome/browser/ui/webui/chromeos/login/voice_interaction_value_prop_sc reen_handler.h"
63 #include "chrome/browser/ui/webui/chromeos/login/wait_for_container_ready_screen _handler.h"
63 #include "chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h" 64 #include "chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h"
64 #include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_pro vider.h" 65 #include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_pro vider.h"
65 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 66 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
66 #include "chrome/browser/ui/webui/test_files_request_filter.h" 67 #include "chrome/browser/ui/webui/test_files_request_filter.h"
67 #include "chrome/browser/ui/webui/theme_source.h" 68 #include "chrome/browser/ui/webui/theme_source.h"
68 #include "chrome/common/chrome_constants.h" 69 #include "chrome/common/chrome_constants.h"
69 #include "chrome/common/chrome_switches.h" 70 #include "chrome/common/chrome_switches.h"
70 #include "chrome/common/pref_names.h" 71 #include "chrome/common/pref_names.h"
71 #include "chrome/common/url_constants.h" 72 #include "chrome/common/url_constants.h"
72 #include "chrome/grit/browser_resources.h" 73 #include "chrome/grit/browser_resources.h"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 331
331 AddScreenHandler(base::MakeUnique<HostPairingScreenHandler>()); 332 AddScreenHandler(base::MakeUnique<HostPairingScreenHandler>());
332 } 333 }
333 334
334 AddScreenHandler(base::MakeUnique<DeviceDisabledScreenHandler>()); 335 AddScreenHandler(base::MakeUnique<DeviceDisabledScreenHandler>());
335 336
336 AddScreenHandler(base::MakeUnique<EncryptionMigrationScreenHandler>()); 337 AddScreenHandler(base::MakeUnique<EncryptionMigrationScreenHandler>());
337 338
338 AddScreenHandler(base::MakeUnique<VoiceInteractionValuePropScreenHandler>()); 339 AddScreenHandler(base::MakeUnique<VoiceInteractionValuePropScreenHandler>());
339 340
341 AddScreenHandler(base::MakeUnique<WaitForContainerReadyScreenHandler>());
342
340 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler. 343 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler.
341 auto kiosk_app_menu_handler = 344 auto kiosk_app_menu_handler =
342 base::MakeUnique<KioskAppMenuHandler>(network_state_informer_); 345 base::MakeUnique<KioskAppMenuHandler>(network_state_informer_);
343 kiosk_app_menu_handler_ = kiosk_app_menu_handler.get(); 346 kiosk_app_menu_handler_ = kiosk_app_menu_handler.get();
344 web_ui->AddMessageHandler(std::move(kiosk_app_menu_handler)); 347 web_ui->AddMessageHandler(std::move(kiosk_app_menu_handler));
345 348
346 base::DictionaryValue localized_strings; 349 base::DictionaryValue localized_strings;
347 GetLocalizedStrings(&localized_strings); 350 GetLocalizedStrings(&localized_strings);
348 351
349 Profile* profile = Profile::FromWebUI(web_ui); 352 Profile* profile = Profile::FromWebUI(web_ui);
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 459
457 EncryptionMigrationScreenView* OobeUI::GetEncryptionMigrationScreenView() { 460 EncryptionMigrationScreenView* OobeUI::GetEncryptionMigrationScreenView() {
458 return GetView<EncryptionMigrationScreenHandler>(); 461 return GetView<EncryptionMigrationScreenHandler>();
459 } 462 }
460 463
461 VoiceInteractionValuePropScreenView* 464 VoiceInteractionValuePropScreenView*
462 OobeUI::GetVoiceInteractionValuePropScreenView() { 465 OobeUI::GetVoiceInteractionValuePropScreenView() {
463 return GetView<VoiceInteractionValuePropScreenHandler>(); 466 return GetView<VoiceInteractionValuePropScreenHandler>();
464 } 467 }
465 468
469 WaitForContainerReadyScreenView* OobeUI::GetWaitForContainerReadyScreenView() {
470 return GetView<WaitForContainerReadyScreenHandler>();
471 }
472
466 UserImageView* OobeUI::GetUserImageView() { 473 UserImageView* OobeUI::GetUserImageView() {
467 return GetView<UserImageScreenHandler>(); 474 return GetView<UserImageScreenHandler>();
468 } 475 }
469 476
470 ErrorScreen* OobeUI::GetErrorScreen() { 477 ErrorScreen* OobeUI::GetErrorScreen() {
471 return error_screen_.get(); 478 return error_screen_.get();
472 } 479 }
473 480
474 SupervisedUserCreationScreenHandler* 481 SupervisedUserCreationScreenHandler*
475 OobeUI::GetSupervisedUserCreationScreenView() { 482 OobeUI::GetSupervisedUserCreationScreenView() {
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 GetLocalizedStrings(&localized_strings); 660 GetLocalizedStrings(&localized_strings);
654 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings); 661 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings);
655 } 662 }
656 663
657 void OobeUI::OnDisplayConfigurationChanged() { 664 void OobeUI::OnDisplayConfigurationChanged() {
658 if (oobe_display_chooser_) 665 if (oobe_display_chooser_)
659 oobe_display_chooser_->TryToPlaceUiOnTouchDisplay(); 666 oobe_display_chooser_->TryToPlaceUiOnTouchDisplay();
660 } 667 }
661 668
662 } // namespace chromeos 669 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698