Merge 176800

chrome/browser/resources/chromeos/login/user_pod_row.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 User pod row implementation.
  */
 
 cr.define('login', function() {
   /**
@@ skipping 39 matching lines @@
    */
   var POD_ROW_IMAGES_LOAD_TIMEOUT_MS = 3000;
 
   /**
    * Oauth token status. These must match UserManager::OAuthTokenStatus.
    * @enum {number}
    * @const
    */
   var OAuthTokenStatus = {
     UNKNOWN: 0,
-    INVALID: 1,
-    VALID: 2
+    INVALID_OLD: 1,
+    VALID_OLD: 2,
+    INVALID_NEW: 3,
+    VALID_NEW: 4
   };
 
   /**
    * Tab order for user pods. Update these when adding new controls.
    * @enum {number}
    * @const
    */
   var UserPodTabOrder = {
     POD_INPUT: 1,    // Password input fields (and whole pods themselves).
     HEADER_BAR: 2,   // Buttons on the header bar (Shutdown, Add User).
@@ skipping 198 matching lines @@
       this.user_ = userDict;
       this.update();
     },
 
     /**
      * Whether Gaia signin is required for this user.
      */
     get needGaiaSignin() {
       // Gaia signin is performed if the user has an invalid oauth token and is
       // not currently signed in (i.e. not the lock screen).
-      return this.user.oauthTokenStatus != OAuthTokenStatus.VALID &&
+      return this.user.oauthTokenStatus != OAuthTokenStatus.VALID_OLD &&
+          this.user.oauthTokenStatus != OAuthTokenStatus.VALID_NEW &&
           !this.user.signedIn;
     },
 
     /**
      * Gets main input element.
      * @type {(HTMLButtonElement|HTMLInputElement)}
      */
     get mainInput() {
       if (!this.signinButtonElement.hidden)
         return this.signinButtonElement;
@@ skipping 674 matching lines @@
         pod.updateUserImage();
     },
 
     /**
      * Resets OAuth token status (invalidates it).
      * @param {string} username User for which to reset the status.
      */
     resetUserOAuthTokenStatus: function(username) {
       var pod = this.getPodWithUsername_(username);
       if (pod) {
-        pod.user.oauthTokenStatus = OAuthTokenStatus.INVALID;
+        pod.user.oauthTokenStatus = OAuthTokenStatus.INVALID_OLD;
         pod.update();
       } else {
         console.log('Failed to update Gaia state for: ' + username);
       }
     },
 
     /**
      * Handler of click event.
      * @param {Event} e Click Event object.
      * @private
@@ skipping 159 matching lines @@
         this.classList.remove('images-loading');
         chrome.send('userImagesLoaded');
       }
     }
   };
 
   return {
     PodRow: PodRow
   };
 });