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

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

Issue 9310050: [cros] Error bubble on login is displayed to the left of Gaia frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Whitespace. Created 8 years, 11 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/screen_gaia_signin.js
diff --git a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
index 9f835793acbfcc668378c02b1945bbb5744ede78..62b94db4c3051bb0365cba9890dc4c06608fef2e 100644
--- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
+++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
@@ -260,6 +260,11 @@ cr.define('login', function() {
}
$('error-message').update();
this.loading = false;
+ // Show deferred error bubble.
+ if (this.errorBubble_) {
+ this.showErrorBubble(this.errorBubble_[0], this.errorBubble_[1]);
+ this.errorBubble_ = undefined;
+ }
this.clearRetry_();
chrome.send('loginWebuiReady');
} else if (msg.method =='offlineLogin' && this.isAuthExtMessage_(e)) {
@@ -360,6 +365,27 @@ cr.define('login', function() {
$('guestSigninLink').onclick = function() {
chrome.send('launchIncognito');
};
+ },
+
+ /**
+ * Shows sign-in error bubble.
+ * @param {number} loginAttempts Number of login attemps tried.
+ * @param {HTMLElement} content Content to show in bubble.
+ */
+ showErrorBubble: function(loginAttempts, error) {
+ if (this.isLocal) {
+ $('add-user-button').hidden = true;
+ $('cancel-add-user-button').hidden = false;
+ // Reload offline version of the sign-in extension, which will show
+ // error itself.
+ chrome.send('offlineLogin', [this.email]);
+ } else if (!this.loading) {
+ $('bubble').showContentForElement($('login-box'), error,
+ cr.ui.Bubble.Attachment.LEFT);
+ } else {
+ // Defer the bubble until the frame has been loaded.
+ this.errorBubble_ = [loginAttempts, error];
+ }
}
};

Powered by Google App Engine
This is Rietveld 408576698