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

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

Issue 2265163002: Updates to showError. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 ab340a07ec31a09d22081b06299469237193d101..b2a3ae4c91c5f06b3ef379831ce18536285b6c74 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
@@ -231,7 +231,8 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
},
/**
- * Cancels enrollment and drops the user back to the login screen.
+ * Cancels the current authentication and drops the user back to the next
+ * screen (either the next authentication or the login screen).
*/
cancel: function() {
if (this.isCancelDisabled)
@@ -277,6 +278,7 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
this.showStep(STEP_ATTRIBUTE_PROMPT_ERROR);
return;
}
+ this.isCancelDisabled_ = false; // Re-enable if called before Gaia loads.
$('oauth-enroll-error-card').textContent = message;
$('oauth-enroll-error-card').buttonLabel =
retry ? loadTimeData.getString('oauthEnrollRetry') : '';
« 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