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 4fde90e4fe37f9552eb1b799df1405041a06d90f..2d1eac0dc7827f3a5cf0838f14d82a475371c6ac 100644 |
--- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js |
+++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js |
@@ -83,13 +83,24 @@ cr.define('login', function() { |
onBeforeShow: function(data) { |
console.log('Opening extension: ' + data.startUrl + |
', opt_email=' + data.email); |
+ |
var frame = $('signin-frame'); |
frame.addEventListener('load', function(e) { |
console.log('Frame loaded: ' + data.startUrl); |
}); |
- frame.contentWindow.location.href = data.startUrl; |
- this.extension_url_ = data.startUrl; |
- // TODO(xiyuan): Pre-populate Gaia with data.email (if any). |
+ |
+ var params = []; |
+ if (data.hl) |
+ params.push('hl=' + encodeURIComponent(data.hl)); |
+ if (data.email) |
+ params.push('email=' + encodeURIComponent(data.email)); |
+ |
+ var url = data.startUrl; |
+ if (params.length) |
+ url += '?' + params.join('&'); |
+ |
+ frame.contentWindow.location.href = url; |
+ this.extension_url_ = url; |
$('createAccount').hidden = !data.createAccount; |
$('guestSignin').hidden = !data.guestSignin; |