[cros,login] Pre-load login extension in the background.

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 25 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
 namespace {
 
 const char kDefaultDomain[] = "@gmail.com";
 
 // Account picker screen id.
 const char kAccountPickerScreen[] = "account-picker";
-// Sign in screen id.
-const char kSigninScreen[] = "signin";
 // Sign in screen id for GAIA extension hosted content.
 const char kGaiaSigninScreen[] = "gaia-signin";
 // Start page of GAIA authentication extension.
 const char kGaiaExtStartPage[] =
     "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/main.html";
 
 // User dictionary keys.
 const char kKeyName[] = "name";
 const char kKeyEmailAddress[] = "emailAddress";
 const char kKeyCanRemove[] = "canRemove";
@@ skipping 155 matching lines @@
     SendState(*it, reason);
   }
 }
 
 // SigninScreenHandler implementation ------------------------------------------
 
 SigninScreenHandler::SigninScreenHandler()
     : delegate_(NULL),
       show_on_init_(false),
       oobe_ui_(false),
+      is_first_webui_ready_(false),
+      is_first_attempt_(true),
       dns_cleared_(false),
       dns_clear_task_running_(false),
       cookies_cleared_(false),
-      extension_driven_(
-          CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kWebUILogin)),
       cookie_remover_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       key_event_listener_(NULL) {
 }
 
 SigninScreenHandler::~SigninScreenHandler() {
   weak_factory_.InvalidateWeakPtrs();
   if (cookie_remover_)
     cookie_remover_->RemoveObserver(this);
   if (key_event_listener_)
@@ skipping 37 matching lines @@
       l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_NETWORK_SELECT));
   localized_strings->SetString("proxyMessageText",
       l10n_util::GetStringUTF16(IDS_LOGIN_PROXY_ERROR_MESSAGE));
   localized_strings->SetString("createAccount",
       l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_HTML));
   localized_strings->SetString("guestSignin",
       l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_HTML));
   localized_strings->SetString("removeUser",
       l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE));
 
-  if (extension_driven_)
-    localized_strings->SetString("authType", "ext");
-  else
-    localized_strings->SetString("authType", "webui");
+  localized_strings->SetString("authType", "ext");
 }
 
 void SigninScreenHandler::Show(bool oobe_ui) {
   oobe_ui_ = oobe_ui;
   if (!page_is_ready()) {
     show_on_init_ = true;
     return;
   }
 
   if (oobe_ui) {
@@ skipping 60 matching lines @@
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("toggleEnrollmentScreen",
       base::Bind(&SigninScreenHandler::HandleToggleEnrollmentScreen,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("launchHelpApp",
       base::Bind(&SigninScreenHandler::HandleLaunchHelpApp,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("createAccount",
       base::Bind(&SigninScreenHandler::HandleCreateAccount,
                  base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("accountPickerReady",
+      base::Bind(&SigninScreenHandler::HandleAccountPickerReady,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("loginWebuiReady",
       base::Bind(&SigninScreenHandler::HandleLoginWebuiReady,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("loginRequestNetworkState",
       base::Bind(&SigninScreenHandler::HandleLoginRequestNetworkState,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("loginAddNetworkStateObserver",
       base::Bind(&SigninScreenHandler::HandleLoginAddNetworkStateObserver,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("loginRemoveNetworkStateObserver",
@@ skipping 48 matching lines @@
   }
 }
 
 void SigninScreenHandler::OnDnsCleared() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   dns_clear_task_running_ = false;
   dns_cleared_ = true;
   ShowSigninScreenIfReady();
 }
 
-// Show sign in screen as soon as we clear dns cache the cookie jar.
 void SigninScreenHandler::ShowSigninScreenIfReady() {
   if (!dns_cleared_ || !cookies_cleared_)
     return;
 
+  LoadAuthExtension(!is_first_attempt_);
+  ShowScreen(kGaiaSigninScreen, NULL);
+
+  if (is_first_attempt_) {
+    is_first_attempt_ = false;
+    if (is_first_webui_ready_)
+      HandleLoginWebuiReady(NULL);
+  }
+}
+
+void SigninScreenHandler::LoadAuthExtension(bool force) {
   DictionaryValue params;
+
+  params.SetBoolean("forceReload", force);
   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.SetBoolean("createAccount",
-      UserCrosSettingsProvider::cached_allow_new_user());
-  params.SetBoolean("guestSignin",
-      UserCrosSettingsProvider::cached_allow_guest());
   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();
     }
   }
-  ShowScreen(kGaiaSigninScreen, &params);
+  web_ui_->CallJavascriptFunction("login.GaiaSigninScreen.setExtensionUrl",
+                                  params);
 }
 
+
 void SigninScreenHandler::ShowSigninScreenForCreds(
     const std::string& username,
     const std::string& password) {
   VLOG(2) << "ShowSigninScreenForCreds " << username << " " << password;
 
   test_user_ = username;
   test_pass_ = password;
   HandleShowAddUser(NULL);
 }
 
@@ skipping 40 matching lines @@
   std::string email;
   if (!args->GetString(0, &email)) {
     NOTREACHED();
     return;
   }
 
   delegate_->RemoveUser(email);
 }
 
 void SigninScreenHandler::HandleShowAddUser(const base::ListValue* args) {
-  if (extension_driven_) {
-    email_.clear();
-    // |args| can be null if it's OOBE.
-    if (args)
-      args->GetString(0, &email_);
+  email_.clear();
+  // |args| can be null if it's OOBE.
+  if (args)
+    args->GetString(0, &email_);
+  if (is_first_attempt_ && email_.empty()) {
+    dns_cleared_ = true;
+    cookies_cleared_ = true;
+    ShowSigninScreenIfReady();
+  } else {
     StartClearingDnsCache();
     StartClearingCookies();
-  } else {
-    ShowScreen(kSigninScreen, NULL);
   }
 }
 
 void SigninScreenHandler::HandleToggleEnrollmentScreen(
     const base::ListValue* args) {
   delegate_->ShowEnterpriseEnrollmentScreen();
 }
 
 void SigninScreenHandler::HandleLaunchHelpApp(const base::ListValue* args) {
   double help_topic_id;  // Javascript number is passed back as double.
@@ skipping 71 matching lines @@
     guest_dict->SetString(kKeyImageUrl, image_url);
     users_list.Append(guest_dict);
   }
 
   // Call the Javascript callback
   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);
+}
+
 void SigninScreenHandler::HandleLoginWebuiReady(const base::ListValue* args) {
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_LOGIN_WEBUI_READY,
-      content::NotificationService::AllSources(),
-      content::NotificationService::NoDetails());
+  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;
+  }
 }
 
 void SigninScreenHandler::HandleLoginRequestNetworkState(
     const base::ListValue* args) {
   std::string callback;
   std::string reason;
   if (!args->GetString(0, &callback) || !args->GetString(1, &reason)) {
     NOTREACHED();
     return;
   }
@@ skipping 44 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