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

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

Issue 1394723002: This CL fixes the issue with login using alternative e-mails. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2526
Patch Set: Created 5 years, 2 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/login_common.js
diff --git a/chrome/browser/resources/chromeos/login/login_common.js b/chrome/browser/resources/chromeos/login/login_common.js
index e9cca699535237ab29f3e56573149e2ab5b17299..dc9fa54e91e3f43f874b66e1ecf4a1d0de63dd40 100644
--- a/chrome/browser/resources/chromeos/login/login_common.js
+++ b/chrome/browser/resources/chromeos/login/login_common.js
@@ -285,10 +285,16 @@ cr.define('cr.ui', function() {
* @param {string} username Login username.
* @param {string} password Login password.
*/
- Oobe.loginForTesting = function(username, password) {
+ Oobe.loginForTesting = function(username, password, gaia_id) {
Oobe.disableSigninUI();
chrome.send('skipToLoginForTesting', [username]);
- chrome.send('completeLogin', ['12345', username, password, false]);
+ if (!gaia_id) {
+ /* TODO (alemate): Remove this backward compatibility hack when
+ as soon as all telemetry tests will pass gaia_id directly.
+ */
+ gaia_id = '12345';
+ }
+ chrome.send('completeLogin', [gaia_id, username, password, false]);
};
/**
« no previous file with comments | « chrome/browser/chromeos/login/test/oobe_base_test.cc ('k') | chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698