| Index: ui/login/display_manager.js
|
| diff --git a/ui/login/display_manager.js b/ui/login/display_manager.js
|
| index 1ec9dec3f48f8cccb7277c68b95f63323340b72b..6b251e371623246317a2d2b0fd27db614f24a6a4 100644
|
| --- a/ui/login/display_manager.js
|
| +++ b/ui/login/display_manager.js
|
| @@ -25,6 +25,7 @@
|
| /** @const */ var SCREEN_CREATE_SUPERVISED_USER_FLOW =
|
| 'supervised-user-creation';
|
| /** @const */ var SCREEN_APP_LAUNCH_SPLASH = 'app-launch-splash';
|
| +/** @const */ var SCREEN_ARC_KIOSK_SPLASH = 'arc-kiosk-splash';
|
| /** @const */ var SCREEN_CONFIRM_PASSWORD = 'confirm-password';
|
| /** @const */ var SCREEN_FATAL_ERROR = 'fatal-error';
|
| /** @const */ var SCREEN_KIOSK_ENABLE = 'kiosk-enable';
|
| @@ -89,6 +90,7 @@
|
| LOCK: 'lock',
|
| USER_ADDING: 'user-adding',
|
| APP_LAUNCH_SPLASH: 'app-launch-splash',
|
| + ARC_KIOSK_SPLASH: 'arc-kiosk-splash',
|
| DESKTOP_USER_MANAGER: 'login-add-user'
|
| };
|
|
|
| @@ -387,6 +389,8 @@ cr.define('cr.ui.login', function() {
|
| } else if (name == ACCELERATOR_APP_LAUNCH_BAILOUT) {
|
| if (currentStepId == SCREEN_APP_LAUNCH_SPLASH)
|
| chrome.send('cancelAppLaunch');
|
| + if (currentStepId == SCREEN_ARC_KIOSK_SPLASH)
|
| + chrome.send('cancelArcKioskLaunch');
|
| } else if (name == ACCELERATOR_APP_LAUNCH_NETWORK_CONFIG) {
|
| if (currentStepId == SCREEN_APP_LAUNCH_SPLASH)
|
| chrome.send('networkConfigRequest');
|
|
|