Use HTML messages to inform GAIA about deviceId.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 398 matching lines @@
   AddCallback("usingSAMLAPI", &GaiaScreenHandler::HandleUsingSAMLAPI);
   AddCallback("scrapedPasswordCount",
               &GaiaScreenHandler::HandleScrapedPasswordCount);
   AddCallback("scrapedPasswordVerificationFailed",
               &GaiaScreenHandler::HandleScrapedPasswordVerificationFailed);
   AddCallback("loginWebuiReady", &GaiaScreenHandler::HandleGaiaUIReady);
   AddCallback("toggleWebviewSignin",
               &GaiaScreenHandler::HandleToggleWebviewSignin);
   AddCallback("toggleEasyBootstrap",
               &GaiaScreenHandler::HandleToggleEasyBootstrap);
+  AddCallback("attemptLogin", &GaiaScreenHandler::HandleAttemptLogin);
 }
 
 void GaiaScreenHandler::HandleFrameLoadingCompleted(int status) {
   const net::Error frame_error = static_cast<net::Error>(-status);
   if (frame_error == net::ERR_ABORTED) {
     LOG(WARNING) << "Ignoring Gaia frame error: " << frame_error;
     return;
   }
   frame_error_ = frame_error;
   if (frame_error == net::OK) {
@@ skipping 142 matching lines @@
 }
 
 void GaiaScreenHandler::HandleToggleEasyBootstrap() {
   use_easy_bootstrap_ = !use_easy_bootstrap_;
   const bool kForceReload = true;
   const bool kSilentLoad = true;
   const bool kNoOfflineUI = false;
   LoadAuthExtension(kForceReload, kSilentLoad, kNoOfflineUI);
 }
 
+void GaiaScreenHandler::HandleAttemptLogin(const std::string& email) {
+  std::string device_id =
+      user_manager::UserManager::Get()->GetKnownUserDeviceId(
+          gaia::CanonicalizeEmail(email));
+
+  if (!device_id.empty() && StartupUtils::IsWebviewSigninEnabled()) {
+    base::DictionaryValue params;
+    params.SetString("deviceId", device_id);
+    CallJS("updateDeviceId", params);
+  } else {
+    // Mark current temporary device Id as used.
+    temporary_device_id_ = std::string();
+  }
+}
+
 void GaiaScreenHandler::HandleGaiaUIReady() {
   if (focus_stolen_) {
     // Set focus to the Gaia page.
     // TODO(altimofeev): temporary solution, until focus parameters are
     // implemented on the Gaia side.
     // Do this only once. Any subsequent call would relod GAIA frame.
     focus_stolen_ = false;
     const char code[] =
         "if (typeof gWindowOnLoad != 'undefined') gWindowOnLoad();";
     content::RenderFrameHost* frame = InlineLoginUI::GetAuthFrame(
@@ skipping 322 matching lines @@
 
   std::string gaia_id;
   if (user_manager::UserManager::Get()->FindGaiaID(context.email, &gaia_id))
     context.gaia_id = gaia_id;
 
   if (Delegate()) {
     context.show_users = Delegate()->IsShowUsers();
     context.has_users = !Delegate()->GetUsers().empty();
   }
 
+  if (!context.email.empty()) {
+    context.device_id = user_manager::UserManager::Get()->GetKnownUserDeviceId(
+        gaia::CanonicalizeEmail(context.email));
+  }
+
   if (context.device_id.empty()) {

[Nikita (slow), 2015/04/23 12:23:12]

nit: drop {}

[Alexander Alekseev, 2015/04/24 12:01:57]

Done.

-    context.device_id = base::GenerateGUID();
-    DCHECK(!context.device_id.empty());
+    context.device_id = GetTemporaryDeviceId();
   }
   context.session_is_ephemeral =
       ChromeUserManager::Get()->AreEphemeralUsersEnabled();
 
   populated_email_.clear();
 
   LoadGaia(context);
 }
 
 void GaiaScreenHandler::UpdateState(NetworkError::ErrorReason reason) {
   if (signin_screen_handler_)
     signin_screen_handler_->UpdateState(reason);
 }
 
 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
   DCHECK(signin_screen_handler_);
   return signin_screen_handler_->delegate_;
 }
 
 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
   signin_screen_handler_ = handler;
 }
 
+std::string GaiaScreenHandler::GetTemporaryDeviceId() {
+  if (temporary_device_id_.empty())
+    temporary_device_id_ = base::GenerateGUID();
+
+  DCHECK(!temporary_device_id_.empty());
+  return temporary_device_id_;
+}
+
 }  // namespace chromeos