Merge 176800

chrome/browser/chromeos/login/user.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 30 matching lines @@
     // Retail mode user, logs in without authentication. This is a special user
     // type used in retail mode only.
     USER_TYPE_RETAIL_MODE,
     // Public account user, logs in without authentication. Available only if
     // enabled through policy.
     USER_TYPE_PUBLIC_ACCOUNT
   } UserType;
 
   // User OAuth token status according to the last check.
   typedef enum {
-    OAUTH_TOKEN_STATUS_UNKNOWN = 0,
-    OAUTH_TOKEN_STATUS_INVALID = 1,
-    OAUTH_TOKEN_STATUS_VALID   = 2,
-  } OAuthTokenStatus;
+     OAUTH_TOKEN_STATUS_UNKNOWN  = 0,
+     OAUTH1_TOKEN_STATUS_INVALID = 1,
+     OAUTH1_TOKEN_STATUS_VALID   = 2,
+     OAUTH2_TOKEN_STATUS_INVALID = 3,
+     OAUTH2_TOKEN_STATUS_VALID   = 4,
+   } OAuthTokenStatus;
 
   // Returned as |image_index| when user-selected file or photo is used as
   // user image.
   static const int kExternalImageIndex = -1;
   // Returned as |image_index| when user profile image is used as user image.
   static const int kProfileImageIndex = -2;
   static const int kInvalidImageIndex = -3;
 
   enum WallpaperType {
     DAILY = 0,
@@ skipping 121 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
 typedef std::vector<User*> UserList;
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_