summaryrefslogtreecommitdiffstats
path: root/ui/login
diff options
context:
space:
mode:
authormnissler <mnissler@chromium.org>2014-12-04 09:40:41 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-04 17:41:17 +0000
commit714aeaaaffb45476f196324bb871a578a29c8902 (patch)
treecf766e683b4888828379071451854f5273d3e13e /ui/login
parentc9be68d2b241bc2eceaf9e9704006cab0d289675 (diff)
downloadchromium_src-714aeaaaffb45476f196324bb871a578a29c8902.zip
chromium_src-714aeaaaffb45476f196324bb871a578a29c8902.tar.gz
chromium_src-714aeaaaffb45476f196324bb871a578a29c8902.tar.bz2
Remove legacy auto-enrollment code.
We no longer support automatic enrollment as part of logging in. The code that triggers forced enrollment during OOBE stays intact though. BUG=chromium:358202 TEST=Everything works as before, just auto-enrollment is gone (which was only accessible via a flag anyways). Review URL: https://codereview.chromium.org/727463002 Cr-Commit-Position: refs/heads/master@{#306851}
Diffstat (limited to 'ui/login')
-rw-r--r--ui/login/display_manager.js4
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/login/display_manager.js b/ui/login/display_manager.js
index c380085..5df2d8e 100644
--- a/ui/login/display_manager.js
+++ b/ui/login/display_manager.js
@@ -365,10 +365,6 @@ cr.define('cr.ui.login', function() {
// In this case update check will be skipped and OOBE will
// proceed straight to enrollment screen when EULA is accepted.
chrome.send('skipUpdateEnrollAfterEula');
- } else if (currentStepId == SCREEN_OOBE_ENROLLMENT) {
- // This accelerator is also used to manually cancel auto-enrollment.
- if (this.currentScreen.cancelAutoEnrollment)
- this.currentScreen.cancelAutoEnrollment();
}
} else if (name == ACCELERATOR_KIOSK_ENABLE) {
if (currentStepId == SCREEN_GAIA_SIGNIN ||