Partial revert of CL 190633002. JS wrapper for GAIA iframe focus grab is back

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

 // Copyright (c) 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/signin_screen_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 276 matching lines @@
 SigninScreenHandler::SigninScreenHandler(
     const scoped_refptr<NetworkStateInformer>& network_state_informer,
     ErrorScreenActor* error_screen_actor,
     CoreOobeActor* core_oobe_actor,
     GaiaScreenHandler* gaia_screen_handler)
     : ui_state_(UI_STATE_UNKNOWN),
       delegate_(NULL),
       native_window_delegate_(NULL),
       show_on_init_(false),
       oobe_ui_(false),
+      focus_stolen_(false),
       gaia_silent_load_(false),
       is_account_picker_showing_first_time_(false),
       dns_cleared_(false),
       dns_clear_task_running_(false),
       cookies_cleared_(false),
       network_state_informer_(network_state_informer),
       using_saml_api_(false),
       test_expects_complete_login_(false),
       weak_factory_(this),
       webui_visible_(false),
@@ skipping 738 matching lines @@
 
   if (!dns_cleared_ || !cookies_cleared_ || !delegate_)
     return;
 
   std::string active_network_path = network_state_informer_->network_path();
   if (gaia_silent_load_ &&
       (network_state_informer_->state() != NetworkStateInformer::ONLINE ||
        gaia_silent_load_network_ != active_network_path)) {
     // Network has changed. Force Gaia reload.
     gaia_silent_load_ = false;
+    // Gaia page will be realoded, so focus isn't stolen anymore.
+    focus_stolen_ = false;
   }
 
   // Note that LoadAuthExtension clears |email_|.
   if (email_.empty())
     delegate_->LoadSigninWallpaper();
   else
     delegate_->LoadWallpaper(email_);
 
   // Set Least Recently Used input method for the user.
   if (!email_.empty())
     SetUserInputMethod(email_);
 
   LoadAuthExtension(!gaia_silent_load_, false, false);
   UpdateUIState(UI_STATE_GAIA_SIGNIN, NULL);
 
   if (gaia_silent_load_) {
     // The variable is assigned to false because silently loaded Gaia page was
     // used.
     gaia_silent_load_ = false;
-    HandleLoginWebuiReady();
+    if (focus_stolen_)
+      HandleLoginWebuiReady();
   }
 
   UpdateState(ErrorScreenActor::ERROR_REASON_UPDATE);
 }
 
 void SigninScreenHandler::LoadAuthExtension(
     bool force, bool silent_load, bool offline) {
   GaiaContext context;
   context.force_reload = force;
   context.is_local = offline;
@@ skipping 266 matching lines @@
 
   user_pod_button_callback_map_.clear();
   user_auth_type_map_.clear();
 
   bool single_user = users.size() == 1;
   std::string owner;
   chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
   bool has_owner = owner.size() > 0;
   size_t max_non_owner_users = has_owner ? kMaxUsers - 1 : kMaxUsers;
   size_t non_owner_count = 0;
-  policy::BrowserPolicyConnectorChromeOS* connector =
-      g_browser_process->platform_part()->
-          browser_policy_connector_chromeos();
-  bool is_enterprise_managed = connector->IsEnterpriseManaged();
 
   for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
     const std::string& email = (*it)->email();
     bool is_owner = (email == owner);
     bool is_public_account =
         ((*it)->GetType() == User::USER_TYPE_PUBLIC_ACCOUNT);
+    policy::BrowserPolicyConnectorChromeOS* connector =

[Nikita (slow), 2014/04/03 11:46:11]

You don't need this code move, it seems to be related to enterprise feature.

+        g_browser_process->platform_part()->
+            browser_policy_connector_chromeos();
+    bool is_enterprise_managed = connector->IsEnterpriseManaged();
 
     if ((is_public_account && !is_signin_to_add) ||
         is_owner ||
         (!is_public_account && non_owner_count < max_non_owner_users)) {
       LoginDisplay::AuthType initial_auth_type =
           ShouldForceOnlineSignIn(*it) ? LoginDisplay::ONLINE_SIGN_IN
                                        : LoginDisplay::OFFLINE_PASSWORD;
       user_auth_type_map_[email] = initial_auth_type;
 
       base::DictionaryValue* user_dict = new base::DictionaryValue();
@@ skipping 50 matching lines @@
 }
 
 void SigninScreenHandler::HandleWallpaperReady() {
   if (ScreenLocker::default_screen_locker()) {
     ScreenLocker::default_screen_locker()->delegate()->
         OnLockBackgroundDisplayed();
   }
 }
 
 void SigninScreenHandler::HandleLoginWebuiReady() {
+  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 =
+        LoginDisplayHostImpl::GetGaiaAuthIframe(web_ui()->GetWebContents());
+    frame->ExecuteJavaScript(base::ASCIIToUTF16(code));
+  }
   if (gaia_silent_load_) {
+    focus_stolen_ = true;
+    // Prevent focus stealing by the Gaia page.
+    // TODO(altimofeev): temporary solution, until focus parameters are
+    // implemented on the Gaia side.
+    const char code[] = "var gWindowOnLoad = window.onload; "
+                        "window.onload=function() {};";
+    content::RenderFrameHost* frame =
+        LoginDisplayHostImpl::GetGaiaAuthIframe(web_ui()->GetWebContents());
+    frame->ExecuteJavaScript(base::ASCIIToUTF16(code));
     // As we could miss and window.onload could already be called, restore
     // focus to current pod (see crbug/175243).
     RefocusCurrentPod();
   }
   DCHECK(gaia_screen_handler_);
   gaia_screen_handler_->HandleFrameLoadingCompleted(0);
 
   if (test_expects_complete_login_)
     SubmitLoginFormForTest();
 }
@@ skipping 318 matching lines @@
   DCHECK(gaia_screen_handler_);
   return gaia_screen_handler_->frame_state();
 }
 
 net::Error SigninScreenHandler::FrameError() const {
   DCHECK(gaia_screen_handler_);
   return gaia_screen_handler_->frame_error();
 }
 
 }  // namespace chromeos