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

Side by Side Diff: ui/login/display_manager.js

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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | ui/login/screen_container.css » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 /** 5 /**
6 * @fileoverview Display manager for WebUI OOBE and login. 6 * @fileoverview Display manager for WebUI OOBE and login.
7 */ 7 */
8 8
9 // TODO(xiyuan): Find a better to share those constants. 9 // TODO(xiyuan): Find a better to share those constants.
10 /** @const */ var SCREEN_OOBE_NETWORK = 'connect'; 10 /** @const */ var SCREEN_OOBE_NETWORK = 'connect';
11 /** @const */ var SCREEN_OOBE_HID_DETECTION = 'hid-detection'; 11 /** @const */ var SCREEN_OOBE_HID_DETECTION = 'hid-detection';
12 /** @const */ var SCREEN_OOBE_EULA = 'eula'; 12 /** @const */ var SCREEN_OOBE_EULA = 'eula';
13 /** @const */ var SCREEN_OOBE_ENABLE_DEBUGGING = 'debugging'; 13 /** @const */ var SCREEN_OOBE_ENABLE_DEBUGGING = 'debugging';
14 /** @const */ var SCREEN_OOBE_UPDATE = 'update'; 14 /** @const */ var SCREEN_OOBE_UPDATE = 'update';
15 /** @const */ var SCREEN_OOBE_RESET = 'reset'; 15 /** @const */ var SCREEN_OOBE_RESET = 'reset';
16 /** @const */ var SCREEN_OOBE_ENROLLMENT = 'oauth-enrollment'; 16 /** @const */ var SCREEN_OOBE_ENROLLMENT = 'oauth-enrollment';
17 /** @const */ var SCREEN_OOBE_KIOSK_ENABLE = 'kiosk-enable'; 17 /** @const */ var SCREEN_OOBE_KIOSK_ENABLE = 'kiosk-enable';
18 /** @const */ var SCREEN_OOBE_AUTO_ENROLLMENT_CHECK = 'auto-enrollment-check'; 18 /** @const */ var SCREEN_OOBE_AUTO_ENROLLMENT_CHECK = 'auto-enrollment-check';
19 /** @const */ var SCREEN_GAIA_SIGNIN = 'gaia-signin'; 19 /** @const */ var SCREEN_GAIA_SIGNIN = 'gaia-signin';
20 /** @const */ var SCREEN_ACCOUNT_PICKER = 'account-picker'; 20 /** @const */ var SCREEN_ACCOUNT_PICKER = 'account-picker';
21 /** @const */ var SCREEN_USER_IMAGE_PICKER = 'user-image'; 21 /** @const */ var SCREEN_USER_IMAGE_PICKER = 'user-image';
22 /** @const */ var SCREEN_ERROR_MESSAGE = 'error-message'; 22 /** @const */ var SCREEN_ERROR_MESSAGE = 'error-message';
23 /** @const */ var SCREEN_TPM_ERROR = 'tpm-error-message'; 23 /** @const */ var SCREEN_TPM_ERROR = 'tpm-error-message';
24 /** @const */ var SCREEN_PASSWORD_CHANGED = 'password-changed'; 24 /** @const */ var SCREEN_PASSWORD_CHANGED = 'password-changed';
25 /** @const */ var SCREEN_CREATE_SUPERVISED_USER_FLOW = 25 /** @const */ var SCREEN_CREATE_SUPERVISED_USER_FLOW =
26 'supervised-user-creation'; 26 'supervised-user-creation';
27 /** @const */ var SCREEN_APP_LAUNCH_SPLASH = 'app-launch-splash'; 27 /** @const */ var SCREEN_APP_LAUNCH_SPLASH = 'app-launch-splash';
28 /** @const */ var SCREEN_ARC_KIOSK_SPLASH = 'arc-kiosk-splash';
28 /** @const */ var SCREEN_CONFIRM_PASSWORD = 'confirm-password'; 29 /** @const */ var SCREEN_CONFIRM_PASSWORD = 'confirm-password';
29 /** @const */ var SCREEN_FATAL_ERROR = 'fatal-error'; 30 /** @const */ var SCREEN_FATAL_ERROR = 'fatal-error';
30 /** @const */ var SCREEN_KIOSK_ENABLE = 'kiosk-enable'; 31 /** @const */ var SCREEN_KIOSK_ENABLE = 'kiosk-enable';
31 /** @const */ var SCREEN_TERMS_OF_SERVICE = 'terms-of-service'; 32 /** @const */ var SCREEN_TERMS_OF_SERVICE = 'terms-of-service';
32 /** @const */ var SCREEN_ARC_TERMS_OF_SERVICE = 'arc-tos'; 33 /** @const */ var SCREEN_ARC_TERMS_OF_SERVICE = 'arc-tos';
33 /** @const */ var SCREEN_WRONG_HWID = 'wrong-hwid'; 34 /** @const */ var SCREEN_WRONG_HWID = 'wrong-hwid';
34 /** @const */ var SCREEN_DEVICE_DISABLED = 'device-disabled'; 35 /** @const */ var SCREEN_DEVICE_DISABLED = 'device-disabled';
35 /** @const */ var SCREEN_UNRECOVERABLE_CRYPTOHOME_ERROR = 36 /** @const */ var SCREEN_UNRECOVERABLE_CRYPTOHOME_ERROR =
36 'unrecoverable-cryptohome-error'; 37 'unrecoverable-cryptohome-error';
37 /** @const */ var SCREEN_ACTIVE_DIRECTORY_PASSWORD_CHANGE = 38 /** @const */ var SCREEN_ACTIVE_DIRECTORY_PASSWORD_CHANGE =
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 }; 83 };
83 84
84 /* Possible types of UI. */ 85 /* Possible types of UI. */
85 /** @const */ var DISPLAY_TYPE = { 86 /** @const */ var DISPLAY_TYPE = {
86 UNKNOWN: 'unknown', 87 UNKNOWN: 'unknown',
87 OOBE: 'oobe', 88 OOBE: 'oobe',
88 LOGIN: 'login', 89 LOGIN: 'login',
89 LOCK: 'lock', 90 LOCK: 'lock',
90 USER_ADDING: 'user-adding', 91 USER_ADDING: 'user-adding',
91 APP_LAUNCH_SPLASH: 'app-launch-splash', 92 APP_LAUNCH_SPLASH: 'app-launch-splash',
93 ARC_KIOSK_SPLASH: 'arc-kiosk-splash',
92 DESKTOP_USER_MANAGER: 'login-add-user' 94 DESKTOP_USER_MANAGER: 'login-add-user'
93 }; 95 };
94 96
95 /** @const */ var USER_ACTION_ROLLBACK_TOGGLED = 'rollback-toggled'; 97 /** @const */ var USER_ACTION_ROLLBACK_TOGGLED = 'rollback-toggled';
96 98
97 cr.define('cr.ui.login', function() { 99 cr.define('cr.ui.login', function() {
98 var Bubble = cr.ui.Bubble; 100 var Bubble = cr.ui.Bubble;
99 101
100 /** 102 /**
101 * Maximum time in milliseconds to wait for step transition to finish. 103 * Maximum time in milliseconds to wait for step transition to finish.
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 if (this.isOobeUI()) 382 if (this.isOobeUI())
381 this.showDeviceRequisitionRemoraPrompt_( 383 this.showDeviceRequisitionRemoraPrompt_(
382 'deviceRequisitionRemoraPromptText', 'remora'); 384 'deviceRequisitionRemoraPromptText', 'remora');
383 } else if (name == ACCELERATOR_DEVICE_REQUISITION_SHARK) { 385 } else if (name == ACCELERATOR_DEVICE_REQUISITION_SHARK) {
384 if (this.isOobeUI()) 386 if (this.isOobeUI())
385 this.showDeviceRequisitionRemoraPrompt_( 387 this.showDeviceRequisitionRemoraPrompt_(
386 'deviceRequisitionSharkPromptText', 'shark'); 388 'deviceRequisitionSharkPromptText', 'shark');
387 } else if (name == ACCELERATOR_APP_LAUNCH_BAILOUT) { 389 } else if (name == ACCELERATOR_APP_LAUNCH_BAILOUT) {
388 if (currentStepId == SCREEN_APP_LAUNCH_SPLASH) 390 if (currentStepId == SCREEN_APP_LAUNCH_SPLASH)
389 chrome.send('cancelAppLaunch'); 391 chrome.send('cancelAppLaunch');
392 if (currentStepId == SCREEN_ARC_KIOSK_SPLASH)
393 chrome.send('cancelArcKioskLaunch');
390 } else if (name == ACCELERATOR_APP_LAUNCH_NETWORK_CONFIG) { 394 } else if (name == ACCELERATOR_APP_LAUNCH_NETWORK_CONFIG) {
391 if (currentStepId == SCREEN_APP_LAUNCH_SPLASH) 395 if (currentStepId == SCREEN_APP_LAUNCH_SPLASH)
392 chrome.send('networkConfigRequest'); 396 chrome.send('networkConfigRequest');
393 } else if (name == ACCELERATOR_TOGGLE_EASY_BOOTSTRAP) { 397 } else if (name == ACCELERATOR_TOGGLE_EASY_BOOTSTRAP) {
394 if (currentStepId == SCREEN_GAIA_SIGNIN) 398 if (currentStepId == SCREEN_GAIA_SIGNIN)
395 chrome.send('toggleEasyBootstrap'); 399 chrome.send('toggleEasyBootstrap');
396 } else if (name == ACCELERATOR_BOOTSTRAPPING_SLAVE) { 400 } else if (name == ACCELERATOR_BOOTSTRAPPING_SLAVE) {
397 chrome.send('setOobeBootstrappingSlave'); 401 chrome.send('setOobeBootstrappingSlave');
398 } 402 }
399 }, 403 },
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 */ 1072 */
1069 DisplayManager.refocusCurrentPod = function() { 1073 DisplayManager.refocusCurrentPod = function() {
1070 $('pod-row').refocusCurrentPod(); 1074 $('pod-row').refocusCurrentPod();
1071 }; 1075 };
1072 1076
1073 // Export 1077 // Export
1074 return { 1078 return {
1075 DisplayManager: DisplayManager 1079 DisplayManager: DisplayManager
1076 }; 1080 };
1077 }); 1081 });
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | ui/login/screen_container.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698