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

Unified Diff: ui/login/display_manager.js

Issue 539273002: Added UI to enable debugging features on CrOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « chromeos/dbus/fake_debug_daemon_client.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 6dc7dd9e156fe0cc91443eddc526d3f82d7a06b2..c38008534cccf195fb9c83dd99cd2d4c070b6e77 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,28 @@ 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_HID_DETECTION,
+ SCREEN_OOBE_NETWORK,
+ SCREEN_OOBE_EULA,
+ SCREEN_OOBE_UPDATE,
+ SCREEN_TERMS_OF_SERVICE
+ ];
+
+ /**
* 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,
];
@@ -334,6 +351,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) {
« no previous file with comments | « chromeos/dbus/fake_debug_daemon_client.cc ('k') | ui/login/screen_container.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698