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

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

Issue 296173008: Added ability to use new GAIA endpoint on CrOS login screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased again. Created 6 years, 7 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 | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2a63e7d7f4a4ee871271b4a8a9a5f34ed0527a51..6e270ed86f8adcc8d86972a9b7ea04342b143a44 100644
--- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
+++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
@@ -256,12 +256,20 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
if (data.localizedStrings)
params.localizedStrings = data.localizedStrings;
+ if (data.useEmbedded)
+ params.gaiaPath = 'EmbeddedSignIn';
+
if (data.forceReload ||
JSON.stringify(this.gaiaAuthParams_) != JSON.stringify(params)) {
this.error_ = 0;
- this.gaiaAuthHost_.load(data.useOffline ?
- cr.login.GaiaAuthHost.AuthMode.OFFLINE :
- cr.login.GaiaAuthHost.AuthMode.DEFAULT,
+
+ var authMode = cr.login.GaiaAuthHost.AuthMode.DEFAULT;
+ if (data.useOffline)
+ authMode = cr.login.GaiaAuthHost.AuthMode.OFFLINE;
+ else if (data.useEmbedded)
+ authMode = cr.login.GaiaAuthHost.AuthMode.DESKTOP;
+
+ this.gaiaAuthHost_.load(authMode,
params,
this.onAuthCompleted_.bind(this));
this.gaiaAuthParams_ = params;
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698