[cros,login] Restore the focus after hidden auth extension has grabbed it.

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

 // Copyright (c) 2011 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/signin_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/hash_tables.h"
@@ skipping 434 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   dns_clear_task_running_ = false;
   dns_cleared_ = true;
   ShowSigninScreenIfReady();
 }
 
 void SigninScreenHandler::ShowSigninScreenIfReady() {
   if (!dns_cleared_ || !cookies_cleared_)
     return;
 
-  LoadAuthExtension(!is_first_attempt_);
+  LoadAuthExtension(!is_first_attempt_, false);
   ShowScreen(kGaiaSigninScreen, NULL);
 
   if (is_first_attempt_) {
     is_first_attempt_ = false;
     if (is_first_webui_ready_)
       HandleLoginWebuiReady(NULL);
   }
 }
 
-void SigninScreenHandler::LoadAuthExtension(bool force) {
+void SigninScreenHandler::LoadAuthExtension(bool force, bool silent_load) {
   DictionaryValue params;
 
   params.SetBoolean("forceReload", force);
+  params.SetBoolean("silentLoad", silent_load);
   params.SetString("startUrl", kGaiaExtStartPage);
   params.SetString("email", email_);
   email_.clear();
 
   params.SetBoolean("createAccount",
       UserCrosSettingsProvider::cached_allow_new_user());
   params.SetBoolean("guestSignin",
       UserCrosSettingsProvider::cached_allow_guest());
 
   const std::string app_locale = g_browser_process->GetApplicationLocale();
   if (!app_locale.empty())
     params.SetString("hl", app_locale);
 
   params.SetString("gaiaOrigin", GaiaUrls::GetInstance()->gaia_origin_url());
 
   // Test automation data:
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
     if (!test_user_.empty()) {
       params.SetString("test_email", test_user_);
       test_user_.clear();
     }
     if (!test_pass_.empty()) {
       params.SetString("test_password", test_pass_);
       test_pass_.clear();
     }
   }
-  web_ui_->CallJavascriptFunction("login.GaiaSigninScreen.setExtensionUrl",
+  web_ui_->CallJavascriptFunction("login.GaiaSigninScreen.loadAuthExtension",
                                   params);
 }
 
 
 void SigninScreenHandler::ShowSigninScreenForCreds(
     const std::string& username,
     const std::string& password) {
   VLOG(2) << "ShowSigninScreenForCreds " << username << " " << password;
 
   test_user_ = username;
@@ skipping 135 matching lines @@
   base::FundamentalValue animated_value(animated);
   web_ui_->CallJavascriptFunction("login.AccountPickerScreen.loadUsers",
                                   users_list, animated_value);
 }
 
 void SigninScreenHandler::HandleAccountPickerReady(
     const base::ListValue* args) {
   // Fetching of the extension is not started before account picker page is
   // loaded because it can affect the loading speed.
   if (is_first_attempt_ && !cookie_remover_ && !dns_clear_task_running_)
-    LoadAuthExtension(true);
+    LoadAuthExtension(true, true);
 }
 
 void SigninScreenHandler::HandleLoginWebuiReady(const base::ListValue* args) {
   if (!is_first_attempt_) {
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_LOGIN_WEBUI_READY,
         content::NotificationService::AllSources(),
         content::NotificationService::NoDetails());
   } else {
     is_first_webui_ready_ = true;
@@ skipping 61 matching lines @@
 
   cookie_remover_ = new BrowsingDataRemover(
       Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context()),
       BrowsingDataRemover::EVERYTHING,
       base::Time());
   cookie_remover_->AddObserver(this);
   cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA);
 }
 
 }  // namespace chromeos