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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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');
« 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