Load webview based GAIA in hidden state and pass focus when ready

chrome/browser/resources/chromeos/login/screen_gaia_signin.js

 // Copyright (c) 2012 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 Oobe signin screen implementation.
  */
 
 login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
   // Gaia loading time after which error message must be displayed and
@@ skipping 82 matching lines @@
      */
     samlPasswordConfirmAttempt_: 0,
 
     /**
      * Whether we should show webview based signin.
      * @type {boolean}
      * @private
      */
     isWebviewSignin: false,
 
-    /**
-     * Whether screen is shown.
-     * @type {boolean}
-     * @private
-     */
-    isShown_: false,
-
     /** @override */
     decorate: function() {
       this.isWebviewSignin = loadTimeData.getValue('isWebviewSignin');
       if (this.isWebviewSignin) {
         // Replace iframe with webview.
         var webview = this.ownerDocument.createElement('webview');
         webview.id = 'signin-frame';
         webview.name = 'signin-frame';
-        // TODO(dpolukhin): webview doesn't load page in hidden state,
-        // use curtain instead.
+        webview.hidden = true;
         $('signin-frame').parentNode.replaceChild(webview, $('signin-frame'));
         this.gaiaAuthHost_ = new cr.login.GaiaAuthHost(webview);
       } else {
         this.gaiaAuthHost_ = new cr.login.GaiaAuthHost($('signin-frame'));
       }
       this.gaiaAuthHost_.addEventListener(
           'ready', this.onAuthReady_.bind(this));
       this.gaiaAuthHost_.confirmPasswordCallback =
           this.onAuthConfirmPassword_.bind(this);
       this.gaiaAuthHost_.noPasswordCallback =
@@ skipping 47 matching lines @@
       chrome.send('updateOfflineLogin', [value]);
     },
 
     /**
      * Shows/hides loading UI.
      * @param {boolean} show True to show loading UI.
      * @private
      */
     showLoadingUI_: function(show) {
       $('gaia-loading').hidden = !show;
-      if (!this.isWebviewSignin) {
-        // TODO(dpolukhin): proper implement curtain for webview signin.
-        this.gaiaAuthHost_.frame.hidden = show;
-      }
+      $('signin-frame').hidden = show;
       $('signin-right').hidden = show;
       $('enterprise-info-container').hidden = show;
       $('gaia-signin-divider').hidden = show;
     },
 
     /**
      * Handler for Gaia loading suspiciously long timeout.
      * @private
      */
     onLoadingSuspiciouslyLong_: function() {
@@ skipping 64 matching lines @@
               SIGNIN_UI_STATE.GAIA_SIGNIN;
 
       // Ensure that GAIA signin (or loading UI) is actually visible.
       window.requestAnimationFrame(function() {
         chrome.send('loginVisible', ['gaia-loading']);
       });
 
       // Button header is always visible when sign in is presented.
       // Header is hidden once GAIA reports on successful sign in.
       Oobe.getInstance().headerHidden = false;
-      this.isShown_ = true;
-      if (this.isWebviewSignin && !this.loading)
-        this.gaiaAuthHost_.sendFocusReady();
+    },
+
+    onAfterShow: function(data) {
+      if (!this.loading && this.isWebviewSignin)
+        $('signin-frame').focus();
     },
 
     /**
      * Event handler that is invoked just before the screen is hidden.
      */
     onBeforeHide: function() {
       chrome.send('loginUIStateChanged', ['gaia-signin', false]);
       $('login-header-bar').signinUIState = SIGNIN_UI_STATE.HIDDEN;
-      this.isShown_ = false;
     },
 
     /**
      * Loads the authentication extension into the iframe.
      * @param {Object} data Extension parameters bag.
      * @private
      */
     loadAuthExtension: function(data) {
       this.isLocal = data.isLocal;
       this.email = '';
@@ skipping 24 matching lines @@
         data.useEmbedded = false;
         params.isMinuteMaidChromeOS = true;
         $('login-header-bar').showGuestButton = true;
       }
 
       if (data.gaiaEndpoint)
         params.gaiaPath = data.gaiaEndpoint;
 
       $('login-header-bar').minuteMaid = this.isMinuteMaid;
 
-
       if (data.useEmbedded)
         params.gaiaPath = 'EmbeddedSignIn';
 
       if (data.forceReload ||
           JSON.stringify(this.gaiaAuthParams_) != JSON.stringify(params)) {
         this.error_ = 0;
 
         var authMode = cr.login.GaiaAuthHost.AuthMode.DEFAULT;
         if (data.useOffline)
           authMode = cr.login.GaiaAuthHost.AuthMode.OFFLINE;
@@ skipping 110 matching lines @@
         $('close-button-item').hidden = !(isSAML || this.cancelAllowed_);
       }
     },
 
     /**
      * Invoked when the auth host emits 'ready' event.
      * @private
      */
     onAuthReady_: function() {
       this.loading = false;
-      if (this.isWebviewSignin && this.isShown_)
-        this.gaiaAuthHost_.sendFocusReady();
       this.clearLoadingTimer_();
 
       // Show deferred error bubble.
       if (this.errorBubble_) {
         this.showErrorBubble(this.errorBubble_[0], this.errorBubble_[1]);
         this.errorBubble_ = undefined;
       }
 
       chrome.send('loginWebuiReady');
       chrome.send('loginVisible', ['gaia-signin']);
@@ skipping 250 matching lines @@
      * For more info see C++ class 'WebUILoginView' which calls this method.
      * @param {number} error Error code.
      * @param {string} url The URL that failed to load.
      */
     onFrameError: function(error, url) {
       this.error_ = error;
       chrome.send('frameLoadingCompleted', [this.error_]);
     },
   };
 });