Chromium Code Reviews| Index: ui/login/display_manager.js |
| diff --git a/ui/login/display_manager.js b/ui/login/display_manager.js |
| index 5561b9e2375e257d97432743c5f941ccdbf82f90..577866028e7636282f79bdca4f4616ebf79d272c 100644 |
| --- a/ui/login/display_manager.js |
| +++ b/ui/login/display_manager.js |
| @@ -10,6 +10,7 @@ |
| /** @const */ var SCREEN_OOBE_NETWORK = 'connect'; |
| /** @const */ var SCREEN_OOBE_HID_DETECTION = 'hid-detection'; |
| /** @const */ var SCREEN_OOBE_EULA = 'eula'; |
| +/** @const */ var SCREEN_OOBE_ENABLE_DEBUGGING = 'debugging'; |
| /** @const */ var SCREEN_OOBE_UPDATE = 'update'; |
| /** @const */ var SCREEN_OOBE_RESET = 'reset'; |
| /** @const */ var SCREEN_OOBE_ENROLLMENT = 'oauth-enrollment'; |
| @@ -32,6 +33,7 @@ |
| /* Accelerator identifiers. Must be kept in sync with webui_login_view.cc. */ |
| /** @const */ var ACCELERATOR_CANCEL = 'cancel'; |
| +/** @const */ var ACCELERATOR_ENABLE_DEBBUGING = 'debugging'; |
| /** @const */ var ACCELERATOR_ENROLLMENT = 'enrollment'; |
| /** @const */ var ACCELERATOR_KIOSK_ENABLE = 'kiosk_enable'; |
| /** @const */ var ACCELERATOR_VERSION = 'version'; |
| @@ -131,13 +133,30 @@ cr.define('cr.ui.login', function() { |
| ]; |
| /** |
| + * Group of screens (screen IDs) where enable debuggingscreen invocation is |
| + * available. |
| + * @type Array.<string> |
| + * @const |
| + */ |
| + var ENABLE_DEBUGGING_AVAILABLE_SCREEN_GROUP = [ |
| + SCREEN_OOBE_NETWORK, |
| + SCREEN_OOBE_EULA, |
| + SCREEN_OOBE_UPDATE, |
| + SCREEN_ERROR_MESSAGE, |
|
Nikita (slow)
2014/11/05 17:33:15
SCREEN_ERROR_MESSAGE may be shown even when there'
zel
2014/11/11 01:02:28
Removed.
|
| + SCREEN_TERMS_OF_SERVICE, |
| + SCREEN_WRONG_HWID, |
| + SCREEN_FATAL_ERROR |
| + ]; |
| + |
| + /** |
| * Group of screens (screen IDs) that are not participating in |
| * left-current-right animation. |
| * @type Array.<string> |
| * @const |
| */ |
| var NOT_ANIMATED_SCREEN_GROUP = [ |
| - SCREEN_OOBE_RESET |
| + SCREEN_OOBE_ENABLE_DEBUGGING, |
| + SCREEN_OOBE_RESET, |
| ]; |
| @@ -331,6 +350,11 @@ cr.define('cr.ui.login', function() { |
| if (this.currentScreen.cancel) { |
| this.currentScreen.cancel(); |
| } |
| + } else if (name == ACCELERATOR_ENABLE_DEBBUGING) { |
| + if (ENABLE_DEBUGGING_AVAILABLE_SCREEN_GROUP.indexOf( |
| + currentStepId) != -1) { |
| + chrome.send('toggleEnableDebuggingScreen'); |
| + } |
| } else if (name == ACCELERATOR_ENROLLMENT) { |
| if (currentStepId == SCREEN_GAIA_SIGNIN || |
| currentStepId == SCREEN_ACCOUNT_PICKER) { |