[ChromeOS] Pass optional email to auth extension.

So that we could pre-populated user email with Gaia UI.

BUG=chromium-os:18599
TEST=Verify fix for chromium-os:18599.


Review URL: http://codereview.chromium.org/7793007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98745 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/chromeos/login/screen_gaia_signin.js

@@ -86,13 +86,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;

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

@@ -273,15 +273,12 @@ void SigninScreenHandler::ShowSigninScreenIfReady() {
     return;
 
   DictionaryValue params;
+  params.SetString("startUrl", kGaiaExtStartPage);
   params.SetString("email", email_);
 
-  std::string url = kGaiaExtStartPage;
   const std::string app_locale = g_browser_process->GetApplicationLocale();
-  if (!app_locale.empty()) {
-    url.append("?hl=");
-    url.append(app_locale);
-  }
-  params.SetString("startUrl", url);
+  if (!app_locale.empty())
+    params.SetString("hl", app_locale);
 
   params.SetBoolean("createAccount",
       UserCrosSettingsProvider::cached_allow_new_user());