ChromeOS Gaia: Do not send 'focusready' message when Gaia window is focused

chrome/browser/resources/gaia_auth_host/authenticator.js

 // Copyright 2014 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.
 
 /**
  * @fileoverview An UI component to authenciate to Chrome. The component hosts
  * IdP web pages in a webview. A client who is interested in monitoring
  * authentication events should pass a listener object of type
  * cr.login.GaiaAuthHost.Listener as defined in this file. After initialization,
  * call {@code load} to start the authentication flow.
@@ skipping 139 matching lines @@
   /**
    * Reloads the authenticator component.
    */
   Authenticator.prototype.reload = function() {
     this.webview_.src = this.reloadUrl_;
     this.authFlow_ = AuthFlow.DEFAULT;
     this.loaded_ = false;
   };
 
   /**
-   * Set focus in Gaia on default input.
+   * Send message 'focusready' to Gaia so it sets focus on default input.
    */
-  Authenticator.prototype.setFocus = function() {
-    this.onFocus_();
+  Authenticator.prototype.sendFocusReady = function() {
+    var currentUrl = this.webview_.src;
+    if (currentUrl.lastIndexOf(this.idpOrigin_) == 0) {
+      var msg = {
+        'method': 'focusready'
+      };
+      // TODO(rsorokin): Get rid of this check once issue crbug.com/456118 is
+      // fixed.
+      if (this.webview_.contentWindow) {
+        console.error('send message');

[Nikita (slow), 2015/02/26 15:10:50]

What is this error about? Please remove it.

[Roman Sorokin (ftl), 2015/02/26 15:14:06]

Oops, sorry. Done.

+        this.webview_.contentWindow.postMessage(msg, currentUrl);
+      }
+    }
   };
 
   Authenticator.prototype.constructInitialFrameUrl_ = function(data) {
     var url = this.idpOrigin_ + (data.gaiaPath || IDP_PATH);
 
     if (this.isMinuteMaidChromeOS) {
       if (data.chromeType)
         url = appendParam(url, 'chrometype', data.chromeType);
       if (data.clientId)
         url = appendParam(url, 'client_id', data.clientId);
@@ skipping 64 matching lines @@
       history.replaceState({url: url});
   };
 
   /**
    * Invoked when the sign-in page takes focus.
    * @param {object} e The focus event being triggered.
    * @private
    */
   Authenticator.prototype.onFocus_ = function(e) {
     this.webview_.focus();
-    var currentUrl = this.webview_.src;
-    if (currentUrl.lastIndexOf(this.idpOrigin_) == 0) {
-      var msg = {
-        'method': 'focusready'
-      };
-      // TODO(rsorokin): Get rid of this check once issue crbug.com/456118 is
-      // fixed.
-      if (this.webview_.contentWindow)
-        this.webview_.contentWindow.postMessage(msg, currentUrl);
-    }
   };
 
   /**
    * Invoked when the history state is changed.
    * @param {object} e The popstate event being triggered.
    * @private
    */
   Authenticator.prototype.onPopState_ = function(e) {
     var state = e.state;
     if (state && state.url)
@@ skipping 145 matching lines @@
   Authenticator.AuthFlow = AuthFlow;
   Authenticator.AuthMode = AuthMode;
   Authenticator.SUPPORTED_PARAMS = SUPPORTED_PARAMS;
 
   return {
     // TODO(guohui, xiyuan): Rename GaiaAuthHost to Authenticator once the old
     // iframe-based flow is deprecated.
     GaiaAuthHost: Authenticator
   };
 });