summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 13:07:59 +0000
committerpastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 13:07:59 +0000
commit969508153bdfb1f6ac67e1ccdc8d4eb3b7c9045f (patch)
tree069461e1438897905d64b70345fc930e5f5e8857
parent48f0deb6c25a7eeb286ac4175282435296a30f4f (diff)
downloadchromium_src-969508153bdfb1f6ac67e1ccdc8d4eb3b7c9045f.zip
chromium_src-969508153bdfb1f6ac67e1ccdc8d4eb3b7c9045f.tar.gz
chromium_src-969508153bdfb1f6ac67e1ccdc8d4eb3b7c9045f.tar.bz2
Allow Enrollment from the pod screen as well.
In re-enrollment scenarios we should be able to reach the enrollment screen from any location. BUG=chromium-os:26157 TEST=Enroll. Login. Stop ui. Delete the /var/lib/whitelist/policy file. Start ui. On the pod screen hit C+A+e the enrollment screen shoud show up. Review URL: https://chromiumcodereview.appspot.com/10532062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142940 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/chromeos/login/display_manager.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/resources/chromeos/login/display_manager.js b/chrome/browser/resources/chromeos/login/display_manager.js
index ac2f301..aeeb2a2 100644
--- a/chrome/browser/resources/chromeos/login/display_manager.js
+++ b/chrome/browser/resources/chromeos/login/display_manager.js
@@ -87,7 +87,8 @@ cr.define('cr.ui.login', function() {
}
} else if (name == ACCELERATOR_ENROLLMENT) {
var currentStepId = this.screens_[this.currentStep_];
- if (currentStepId == SCREEN_GAIA_SIGNIN) {
+ if (currentStepId == SCREEN_GAIA_SIGNIN ||
+ currentStepId == SCREEN_ACCOUNT_PICKER) {
chrome.send('toggleEnrollmentScreen');
} else if (currentStepId == SCREEN_OOBE_NETWORK ||
currentStepId == SCREEN_OOBE_EULA) {