Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Unified Diff: chrome/browser/resources/chromeos/login/user_pod_row.js

Issue 11649055: OAuth2 sign-in flow for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clang fix Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/chromeos/login/user_pod_row.js
diff --git a/chrome/browser/resources/chromeos/login/user_pod_row.js b/chrome/browser/resources/chromeos/login/user_pod_row.js
index 557e8153432ba5a7a343fc7d249aac9ca0c0952f..cc1bfe118268be7ebbb3810ba9be2d555386ebbf 100644
--- a/chrome/browser/resources/chromeos/login/user_pod_row.js
+++ b/chrome/browser/resources/chromeos/login/user_pod_row.js
@@ -57,8 +57,10 @@ cr.define('login', function() {
*/
var OAuthTokenStatus = {
UNKNOWN: 0,
- INVALID: 1,
- VALID: 2
+ INVALID_OLD: 1,
+ VALID_OLD: 2,
+ INVALID_NEW: 3,
+ VALID_NEW: 4
};
/**
@@ -277,7 +279,8 @@ cr.define('login', function() {
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;
},
@@ -972,7 +975,7 @@ cr.define('login', function() {
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);

Powered by Google App Engine
This is Rietveld 408576698