Index: chrome/browser/resources/chromeos/login/display_manager.js |
diff --git a/chrome/browser/resources/chromeos/login/display_manager.js b/chrome/browser/resources/chromeos/login/display_manager.js |
index c7bf27a9e9bd00f8660bdb1a058e9e2489db66c2..af0528ad28a140d0f6df7f4dd14bdb6232642bf5 100644 |
--- a/chrome/browser/resources/chromeos/login/display_manager.js |
+++ b/chrome/browser/resources/chromeos/login/display_manager.js |
@@ -9,6 +9,7 @@ |
// TODO(xiyuan): Find a better to share those constants. |
/** @const */ var SCREEN_OOBE_NETWORK = 'connect'; |
/** @const */ var SCREEN_OOBE_EULA = 'eula'; |
+/** @const */ var SCREEN_OOBE_ENROLLMENT = 'oauth-enrollment'; |
/** @const */ var SCREEN_GAIA_SIGNIN = 'gaia-signin'; |
/** @const */ var SCREEN_ACCOUNT_PICKER = 'account-picker'; |
@@ -95,6 +96,10 @@ 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_VERSION) { |
if (this.allowToggleVersion_) |