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

Unified Diff: ui/login/display_manager.js

Issue 2577093002: Enable Active Directory shortcut on the welcome screen (Closed)
Patch Set: Created 4 years 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/signin_screen_handler.cc ('k') | no next file » | 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 a3b5210c55d11679af0d16a7557592507e67f570..5ca41e2fd8983efed10bd1eb9193db919fd2bbd8 100644
--- a/ui/login/display_manager.js
+++ b/ui/login/display_manager.js
@@ -344,7 +344,10 @@ cr.define('cr.ui.login', function() {
currentStepId) != -1) {
chrome.send('toggleEnableDebuggingScreen');
}
- } else if (name == ACCELERATOR_ENROLLMENT) {
+ } else if (name == ACCELERATOR_ENROLLMENT ||
+ name == ACCELERATOR_ENROLLMENT_AD) {
+ if (name == ACCELERATOR_ENROLLMENT_AD)
+ chrome.send('toggleEnrollmentAd');
if (currentStepId == SCREEN_GAIA_SIGNIN ||
currentStepId == SCREEN_ACCOUNT_PICKER) {
chrome.send('toggleEnrollmentScreen');
@@ -354,11 +357,6 @@ cr.define('cr.ui.login', function() {
// proceed straight to enrollment screen when EULA is accepted.
chrome.send('skipUpdateEnrollAfterEula');
}
- } else if (name == ACCELERATOR_ENROLLMENT_AD) {
- if (currentStepId == SCREEN_GAIA_SIGNIN ||
- currentStepId == SCREEN_ACCOUNT_PICKER) {
- chrome.send('toggleEnrollmentAd');
- }
} else if (name == ACCELERATOR_KIOSK_ENABLE) {
if (currentStepId == SCREEN_GAIA_SIGNIN ||
currentStepId == SCREEN_ACCOUNT_PICKER) {
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698