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

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

Issue 2649103006: arc: Add splash screen for ARC++ Kiosk startup (Closed)
Patch Set: Created 3 years, 11 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 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 screen->set_auto_enrollment_controller(host_->GetAutoEnrollmentController()); 594 screen->set_auto_enrollment_controller(host_->GetAutoEnrollmentController());
595 SetCurrentScreen(screen); 595 SetCurrentScreen(screen);
596 } 596 }
597 597
598 void WizardController::ShowSupervisedUserCreationScreen() { 598 void WizardController::ShowSupervisedUserCreationScreen() {
599 VLOG(1) << "Showing Locally managed user creation screen screen."; 599 VLOG(1) << "Showing Locally managed user creation screen screen.";
600 SetStatusAreaVisible(true); 600 SetStatusAreaVisible(true);
601 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW)); 601 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW));
602 } 602 }
603 603
604 void WizardController::ShowArcKioskSplashScreen() {
605 VLOG(1) << "Showing ARC kiosk splash screen.";
606 SetStatusAreaVisible(false);
607 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_ARC_KIOSK_SPLASH));
608 }
609
604 void WizardController::ShowHIDDetectionScreen() { 610 void WizardController::ShowHIDDetectionScreen() {
605 VLOG(1) << "Showing HID discovery screen."; 611 VLOG(1) << "Showing HID discovery screen.";
606 SetStatusAreaVisible(true); 612 SetStatusAreaVisible(true);
607 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_OOBE_HID_DETECTION)); 613 SetCurrentScreen(GetScreen(OobeScreen::SCREEN_OOBE_HID_DETECTION));
608 // In HID detection screen, puts the Bluetooth in discoverable mode and waits 614 // In HID detection screen, puts the Bluetooth in discoverable mode and waits
609 // for the incoming Bluetooth connection request. See the comments in 615 // for the incoming Bluetooth connection request. See the comments in
610 // WizardController::ShowNetworkScreen() for more details. 616 // WizardController::ShowNetworkScreen() for more details.
611 MaybeStartListeningForSharkConnection(); 617 MaybeStartListeningForSharkConnection();
612 } 618 }
613 619
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 } else if (screen == OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE) { 1047 } else if (screen == OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE) {
1042 ShowArcTermsOfServiceScreen(); 1048 ShowArcTermsOfServiceScreen();
1043 } else if (screen == OobeScreen::SCREEN_WRONG_HWID) { 1049 } else if (screen == OobeScreen::SCREEN_WRONG_HWID) {
1044 ShowWrongHWIDScreen(); 1050 ShowWrongHWIDScreen();
1045 } else if (screen == OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK) { 1051 } else if (screen == OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK) {
1046 ShowAutoEnrollmentCheckScreen(); 1052 ShowAutoEnrollmentCheckScreen();
1047 } else if (screen == OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW) { 1053 } else if (screen == OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW) {
1048 ShowSupervisedUserCreationScreen(); 1054 ShowSupervisedUserCreationScreen();
1049 } else if (screen == OobeScreen::SCREEN_APP_LAUNCH_SPLASH) { 1055 } else if (screen == OobeScreen::SCREEN_APP_LAUNCH_SPLASH) {
1050 AutoLaunchKioskApp(); 1056 AutoLaunchKioskApp();
1057 } else if (screen == OobeScreen::SCREEN_ARC_KIOSK_SPLASH) {
1058 ShowArcKioskSplashScreen();
1051 } else if (screen == OobeScreen::SCREEN_OOBE_HID_DETECTION) { 1059 } else if (screen == OobeScreen::SCREEN_OOBE_HID_DETECTION) {
1052 ShowHIDDetectionScreen(); 1060 ShowHIDDetectionScreen();
1053 } else if (screen == OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING) { 1061 } else if (screen == OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING) {
1054 ShowControllerPairingScreen(); 1062 ShowControllerPairingScreen();
1055 } else if (screen == OobeScreen::SCREEN_OOBE_HOST_PAIRING) { 1063 } else if (screen == OobeScreen::SCREEN_OOBE_HOST_PAIRING) {
1056 ShowHostPairingScreen(); 1064 ShowHostPairingScreen();
1057 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) { 1065 } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) {
1058 ShowDeviceDisabledScreen(); 1066 ShowDeviceDisabledScreen();
1059 } else if (screen != OobeScreen::SCREEN_TEST_NO_WINDOW) { 1067 } else if (screen != OobeScreen::SCREEN_TEST_NO_WINDOW) {
1060 if (is_out_of_box_) { 1068 if (is_out_of_box_) {
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1507 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1500 } 1508 }
1501 1509
1502 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1510 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1503 screen->SetParameters(effective_config, shark_controller_.get()); 1511 screen->SetParameters(effective_config, shark_controller_.get());
1504 SetStatusAreaVisible(true); 1512 SetStatusAreaVisible(true);
1505 SetCurrentScreen(screen); 1513 SetCurrentScreen(screen);
1506 } 1514 }
1507 1515
1508 } // namespace chromeos 1516 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698