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

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

Issue 2649103006: arc: Add splash screen for ARC++ Kiosk startup (Closed)
Patch Set: achuithb@ comments Created 3 years, 10 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 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 screen->set_auto_enrollment_controller(host_->GetAutoEnrollmentController()); 587 screen->set_auto_enrollment_controller(host_->GetAutoEnrollmentController());
588 SetCurrentScreen(screen); 588 SetCurrentScreen(screen);
589 } 589 }
590 590
591 void WizardController::ShowSupervisedUserCreationScreen() { 591 void WizardController::ShowSupervisedUserCreationScreen() {
592 VLOG(1) << "Showing Locally managed user creation screen screen."; 592 VLOG(1) << "Showing Locally managed user creation screen screen.";
593 SetStatusAreaVisible(true); 593 SetStatusAreaVisible(true);
594 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW)); 594 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW));
595 } 595 }
596 596
597 void WizardController::ShowArcKioskSplashScreen() {
598 VLOG(1) << "Showing ARC kiosk splash screen.";
599 SetStatusAreaVisible(false);
600 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_ARC_KIOSK_SPLASH));
601 }
602
597 void WizardController::ShowHIDDetectionScreen() { 603 void WizardController::ShowHIDDetectionScreen() {
598 VLOG(1) << "Showing HID discovery screen."; 604 VLOG(1) << "Showing HID discovery screen.";
599 SetStatusAreaVisible(true); 605 SetStatusAreaVisible(true);
600 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_OOBE_HID_DETECTION)); 606 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_OOBE_HID_DETECTION));
601 // In HID detection screen, puts the Bluetooth in discoverable mode and waits 607 // In HID detection screen, puts the Bluetooth in discoverable mode and waits
602 // for the incoming Bluetooth connection request. See the comments in 608 // for the incoming Bluetooth connection request. See the comments in
603 // WizardController::ShowNetworkScreen() for more details. 609 // WizardController::ShowNetworkScreen() for more details.
604 MaybeStartListeningForSharkConnection(); 610 MaybeStartListeningForSharkConnection();
605 } 611 }
606 612
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 } else if (screen == OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE) { 1040 } else if (screen == OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE) {
1035 ShowArcTermsOfServiceScreen(); 1041 ShowArcTermsOfServiceScreen();
1036 } else if (screen == OobeScreen::SCREEN_WRONG_HWID) { 1042 } else if (screen == OobeScreen::SCREEN_WRONG_HWID) {
1037 ShowWrongHWIDScreen(); 1043 ShowWrongHWIDScreen();
1038 } else if (screen == OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK) { 1044 } else if (screen == OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK) {
1039 ShowAutoEnrollmentCheckScreen(); 1045 ShowAutoEnrollmentCheckScreen();
1040 } else if (screen == OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW) { 1046 } else if (screen == OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW) {
1041 ShowSupervisedUserCreationScreen(); 1047 ShowSupervisedUserCreationScreen();
1042 } else if (screen == OobeScreen::SCREEN_APP_LAUNCH_SPLASH) { 1048 } else if (screen == OobeScreen::SCREEN_APP_LAUNCH_SPLASH) {
1043 AutoLaunchKioskApp(); 1049 AutoLaunchKioskApp();
1050 } else if (screen == OobeScreen::SCREEN_ARC_KIOSK_SPLASH) {
1051 ShowArcKioskSplashScreen();
1044 } else if (screen == OobeScreen::SCREEN_OOBE_HID_DETECTION) { 1052 } else if (screen == OobeScreen::SCREEN_OOBE_HID_DETECTION) {
1045 ShowHIDDetectionScreen(); 1053 ShowHIDDetectionScreen();
1046 } else if (screen == OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING) { 1054 } else if (screen == OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING) {
1047 ShowControllerPairingScreen(); 1055 ShowControllerPairingScreen();
1048 } else if (screen == OobeScreen::SCREEN_OOBE_HOST_PAIRING) { 1056 } else if (screen == OobeScreen::SCREEN_OOBE_HOST_PAIRING) {
1049 ShowHostPairingScreen(); 1057 ShowHostPairingScreen();
1050 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) { 1058 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) {
1051 ShowDeviceDisabledScreen(); 1059 ShowDeviceDisabledScreen();
1052 } else if (screen != OobeScreen::SCREEN_TEST_NO_WINDOW) { 1060 } else if (screen != OobeScreen::SCREEN_TEST_NO_WINDOW) {
1053 if (is_out_of_box_) { 1061 if (is_out_of_box_) {
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
1492 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1500 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1493 } 1501 }
1494 1502
1495 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1503 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1496 screen->SetParameters(effective_config, shark_controller_.get()); 1504 screen->SetParameters(effective_config, shark_controller_.get());
1497 SetStatusAreaVisible(true); 1505 SetStatusAreaVisible(true);
1498 SetCurrentScreen(screen); 1506 SetCurrentScreen(screen);
1499 } 1507 }
1500 1508
1501 } // namespace chromeos 1509 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | chrome/browser/resources/chromeos/login/login.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698