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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 2912593002: Create OOBE screen for Voice Interaction value proposition (Closed)
Patch Set: Create OOBE screen for Voice Interaction value proposition 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" 52 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
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/wrong_hwid_screen_handler.h" 63 #include "chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h"
63 #include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_pro vider.h" 64 #include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_pro vider.h"
64 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h" 65 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
65 #include "chrome/browser/ui/webui/test_files_request_filter.h" 66 #include "chrome/browser/ui/webui/test_files_request_filter.h"
66 #include "chrome/browser/ui/webui/theme_source.h" 67 #include "chrome/browser/ui/webui/theme_source.h"
67 #include "chrome/common/chrome_constants.h" 68 #include "chrome/common/chrome_constants.h"
68 #include "chrome/common/chrome_switches.h" 69 #include "chrome/common/chrome_switches.h"
69 #include "chrome/common/pref_names.h" 70 #include "chrome/common/pref_names.h"
70 #include "chrome/common/url_constants.h" 71 #include "chrome/common/url_constants.h"
71 #include "chrome/grit/browser_resources.h" 72 #include "chrome/grit/browser_resources.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 if (display_type_ == kOobeDisplay) { 329 if (display_type_ == kOobeDisplay) {
329 AddScreenHandler(base::MakeUnique<ControllerPairingScreenHandler>()); 330 AddScreenHandler(base::MakeUnique<ControllerPairingScreenHandler>());
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
339 AddScreenHandler(base::MakeUnique<VoiceInteractionValuePropScreenHandler>());
340
338 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler. 341 // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler.
339 auto kiosk_app_menu_handler = 342 auto kiosk_app_menu_handler =
340 base::MakeUnique<KioskAppMenuHandler>(network_state_informer_); 343 base::MakeUnique<KioskAppMenuHandler>(network_state_informer_);
341 kiosk_app_menu_handler_ = kiosk_app_menu_handler.get(); 344 kiosk_app_menu_handler_ = kiosk_app_menu_handler.get();
342 web_ui->AddMessageHandler(std::move(kiosk_app_menu_handler)); 345 web_ui->AddMessageHandler(std::move(kiosk_app_menu_handler));
343 346
344 base::DictionaryValue localized_strings; 347 base::DictionaryValue localized_strings;
345 GetLocalizedStrings(&localized_strings); 348 GetLocalizedStrings(&localized_strings);
346 349
347 Profile* profile = Profile::FromWebUI(web_ui); 350 Profile* profile = Profile::FromWebUI(web_ui);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 } 452 }
450 453
451 DeviceDisabledScreenView* OobeUI::GetDeviceDisabledScreenView() { 454 DeviceDisabledScreenView* OobeUI::GetDeviceDisabledScreenView() {
452 return GetView<DeviceDisabledScreenHandler>(); 455 return GetView<DeviceDisabledScreenHandler>();
453 } 456 }
454 457
455 EncryptionMigrationScreenView* OobeUI::GetEncryptionMigrationScreenView() { 458 EncryptionMigrationScreenView* OobeUI::GetEncryptionMigrationScreenView() {
456 return GetView<EncryptionMigrationScreenHandler>(); 459 return GetView<EncryptionMigrationScreenHandler>();
457 } 460 }
458 461
462 VoiceInteractionValuePropScreenView*
463 OobeUI::GetVoiceInteractionValuePropScreenView() {
464 return GetView<VoiceInteractionValuePropScreenHandler>();
465 }
466
459 UserImageView* OobeUI::GetUserImageView() { 467 UserImageView* OobeUI::GetUserImageView() {
460 return GetView<UserImageScreenHandler>(); 468 return GetView<UserImageScreenHandler>();
461 } 469 }
462 470
463 ErrorScreen* OobeUI::GetErrorScreen() { 471 ErrorScreen* OobeUI::GetErrorScreen() {
464 return error_screen_.get(); 472 return error_screen_.get();
465 } 473 }
466 474
467 SupervisedUserCreationScreenHandler* 475 SupervisedUserCreationScreenHandler*
468 OobeUI::GetSupervisedUserCreationScreenView() { 476 OobeUI::GetSupervisedUserCreationScreenView() {
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 GetLocalizedStrings(&localized_strings); 654 GetLocalizedStrings(&localized_strings);
647 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings); 655 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings);
648 } 656 }
649 657
650 void OobeUI::OnDisplayConfigurationChanged() { 658 void OobeUI::OnDisplayConfigurationChanged() {
651 if (oobe_display_chooser_) 659 if (oobe_display_chooser_)
652 oobe_display_chooser_->TryToPlaceUiOnTouchDisplay(); 660 oobe_display_chooser_->TryToPlaceUiOnTouchDisplay();
653 } 661 }
654 662
655 } // namespace chromeos 663 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698