ChromeOS: GAIA screen should support API v2.

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 animation guard timer. Started when GAIA page is loaded
@@ skipping 161 matching lines @@
      * The most recent period of time that the user has interacted. This is
      * only updated when the offline page is active and the device is online.
      */
     mostRecentUserActivity_: Date.now(),
 
     /**
      * An element containg navigation buttons.
      */
     navigation_: undefined,
 
+
+    /**
+     * This is a copy of authenticator object attribute.
+     * UI is tied to API version, so we adjust authernticator container
+     * to match the API version.
+     * Note that this cannot be changed after authenticator is created.
+     */
+    chromeOSApiVersion_: undefined,
+
     /** @override */
     decorate: function() {
       this.navigation_ = $('gaia-navigation');
 
       this.gaiaAuthHost_ = new cr.login.GaiaAuthHost($('signin-frame'));
       this.gaiaAuthHost_.addEventListener(
           'ready', this.onAuthReady_.bind(this));
 
       var that = this;
       [this.gaiaAuthHost_, $('offline-gaia'), $('offline-ad-auth')].forEach(
@@ skipping 44 matching lines @@
       this.gaiaAuthHost_.addEventListener(
           'authFlowChange', this.onAuthFlowChange_.bind(this));
       this.gaiaAuthHost_.addEventListener(
           'videoEnabledChange', this.onVideoEnabledChange_.bind(this));
 
       this.gaiaAuthHost_.addEventListener(
           'loadAbort', this.onLoadAbortMessage_.bind(this));
       this.gaiaAuthHost_.addEventListener(
           'identifierEntered', this.onIdentifierEnteredMessage_.bind(this));
 
-      this.navigation_.addEventListener('back', function() {
-        this.navigation_.backVisible = false;
-        this.getSigninFrame_().back();
-      }.bind(this));
+      this.navigation_.addEventListener(
+          'back', this.onBackButtonClicked_.bind(this, null));
+
+      $('signin-back-button')
+          .addEventListener(
+              'click', this.onBackButtonClicked_.bind(this, true));
 
       this.navigation_.addEventListener('close', function() {
         this.cancel();
       }.bind(this));
       this.navigation_.addEventListener('refresh', function() {
         this.cancel();
       }.bind(this));
 
       $('gaia-whitelist-error').addEventListener('buttonclick', function() {
         this.showWhitelistCheckFailedError(false);
@@ skipping 13 matching lines @@
           .addEventListener('samlPageChangeAccountClicked', function() {
             // The user requests to change the account. We must clear the email
             // field of the auth params.
             this.gaiaAuthParams_.email = '';
             this.screenMode = ScreenMode.DEFAULT;
             this.loadGaiaAuthHost_(false /* doSamlRedirect */);
           }.bind(this));
     },
 
     /**
+     * Handles clicks on "Back" button.
+     * @param {boolean} isDialogButton If event comes from gaia-dialog.
+     */
+    onBackButtonClicked_: function(isDialogButton) {
+      if (isDialogButton && !this.navigation_.backVisible) {
+        this.cancel();
+      } else {
+        this.navigation_.backVisible = false;
+        this.getSigninFrame_().back();
+      }
+    },
+
+    /**
      * Loads the authenticator and updates the UI to reflect the loading state.
      * @param {boolean} doSamlRedirect If the authenticator should do
      *     authentication by automatic redirection to the SAML-based enrollment
      *     enterprise domain IdP.
      */
     loadGaiaAuthHost_: function(doSamlRedirect) {
       this.loading = true;
       this.startLoadingTimer_();
 
       this.gaiaAuthParams_.doSamlRedirect = doSamlRedirect;
@@ skipping 17 matching lines @@
       return this.screenMode_ == ScreenMode.OFFLINE;
     },
 
     /**
      * Sets the current screen mode and updates the visible elements
      * accordingly.
      * @param {integer} value The screen mode.
      */
     set screenMode(value) {
       this.screenMode_ = value;
+      this.updateSigninFrameContainers_();
       switch (this.screenMode_) {
         case ScreenMode.DEFAULT:
+          $('signin-frame-dialog').hidden = false;
           $('signin-frame').hidden = false;
           $('offline-gaia').hidden = true;
           $('saml-interstitial').hidden = true;
           $('offline-ad-auth').hidden = true;
           break;
         case ScreenMode.OFFLINE:
+          $('signin-frame-dialog').hidden = true;
           $('signin-frame').hidden = true;
           $('offline-gaia').hidden = false;
           $('saml-interstitial').hidden = true;
           $('offline-ad-auth').hidden = true;
           break;
         case ScreenMode.AD_AUTH:
+          $('signin-frame-dialog').hidden = true;
           $('signin-frame').hidden = true;
           $('offline-gaia').hidden = true;
           $('saml-interstitial').hidden = true;
           $('offline-ad-auth').hidden = false;
           break;
         case ScreenMode.SAML_INTERSTITIAL:
+          $('signin-frame-dialog').hidden = true;
           $('signin-frame').hidden = true;
           $('offline-gaia').hidden = true;
           $('saml-interstitial').hidden = false;
           $('offline-ad-auth').hidden = true;
           break;
       }
-
       chrome.send('updateOfflineLogin', [this.isOffline()]);
       this.updateControlsState();
     },
 
     /**
      * This enables or disables trying to go back to the online login page
      * after the user is idle for a few minutes, assuming that we're currently
      * in the offline one. This is only applicable when the offline page is
      * currently active. It is intended that when the device goes online, this
      * gets called with true; when it goes offline, this gets called with
@@ skipping 236 matching lines @@
 
       $('login-header-bar').showCreateSupervisedButton =
           data.supervisedUsersCanCreate;
       $('login-header-bar').showGuestButton = data.guestSignin;
 
       // Reset SAML
       this.classList.toggle('full-width', false);
       $('saml-notice-container').hidden = true;
       this.samlPasswordConfirmAttempt_ = 0;
 
+      this.chromeOSApiVersion_ = data.chromeOSApiVersion;
+      if (this.chromeOSApiVersion_ == 2)
+        $('signin-frame-container-v2').appendChild($('signin-frame'));
+
+      this.updateSigninFrameContainers_();
+
       // Screen size could have been changed because of 'full-width' classes.
       if (Oobe.getInstance().currentScreen === this)
         Oobe.getInstance().updateScreenSize(this);
 
       var params = {};
       for (var i in cr.login.GaiaAuthHost.SUPPORTED_PARAMS) {
         var name = cr.login.GaiaAuthHost.SUPPORTED_PARAMS[i];
         if (data[name])
           params[name] = data[name];
       }
@@ skipping 22 matching lines @@
             this.loading = false;
           // This event is for the browser tests.
           $('saml-interstitial').fire('samlInterstitialPageReady');
           break;
       }
       this.updateControlsState();
       chrome.send('authExtensionLoaded');
     },
 
     /**
+     * Displays correct screen container for given mode and APi version.
+     */
+    updateSigninFrameContainers_: function() {
+      let old_state = this.classList.contains('v2');
+      this.classList.toggle('v2', false);
+      if (this.screenMode_ == ScreenMode.DEFAULT &&
+          this.chromeOSApiVersion_ == 2) {
+        this.classList.toggle('v2', true);
+      }
+      // Switching between signin-frame-dialog and gaia-step-contents
+      // updates screen size.
+      if (old_state != this.classList.contains('v2'))
+        Oobe.getInstance().updateScreenSize(this);
+    },
+
+    /**
      * Whether the current auth flow is SAML.
      */
     isSAML: function() {
       return this.gaiaAuthHost_.authFlow == cr.login.GaiaAuthHost.AuthFlow.SAML;
     },
 
     /**
      * Helper function to update the title bar.
      */
     updateSamlNotice_: function() {
@@ skipping 456 matching lines @@
       if (this.screenMode_ != ScreenMode.AD_AUTH)
         return;
       var adAuthUI = this.getSigninFrame_();
       adAuthUI.setUser(username);
       adAuthUI.setInvalid(errorState);
       this.loading = false;
       Oobe.getInstance().headerHidden = false;
     }
   };
 });