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

Unified Diff: chrome/browser/resources/chromeos/login/display_manager.js

Issue 10694099: Replace the link to opt-out of auto-enrollment with a keyboard shortcut. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months 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
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_)
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698