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

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

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

Powered by Google App Engine
This is Rietveld 408576698