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

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

Issue 10823057: Prevent the Ctrl+Alt+E shortcut from cancelling from the normal enrollment screen too. (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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
index d19bdfbfd32eb2550bd98858a173325209600d6d..5ad4e31e3f23ecdd4f61566983997429f4ffd585 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
@@ -252,6 +252,8 @@ cr.define('oobe', function() {
* Handler for cancellations of an enforced auto-enrollment.
*/
cancelAutoEnrollment: function() {
+ if (!this.isAutoEnrollment_)
+ return;
if (!this.confirmDialog_) {
this.confirmDialog_ = new cr.ui.dialogs.ConfirmDialog(document.body);
this.confirmDialog_.setOkLabel(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698