Index: chrome/browser/chromeos/login/user_manager.cc |
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc |
index 8dd7e1725b8bde6b2d9807ea7e69211e5ba1e52e..683176bb9fa38ac2e21443870e1389feddc0d26a 100644 |
--- a/chrome/browser/chromeos/login/user_manager.cc |
+++ b/chrome/browser/chromeos/login/user_manager.cc |
@@ -289,12 +289,18 @@ std::vector<UserManager::User> UserManager::GetUsers() const { |
user.set_email(email); |
// Get OAuth token status. |
- int oauth_token_status; |
- if (prefs_oauth_status && |
- prefs_oauth_status->GetIntegerWithoutPathExpansion(email, |
- &oauth_token_status)) { |
- user.set_oauth_token_status( |
- static_cast<OAuthTokenStatus>(oauth_token_status)); |
+ if (CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSkipOAuthLogin)) { |
+ // Use OAUTH_TOKEN_STATUS_VALID flag if kSkipOAuthLogin is present. |
+ user.set_oauth_token_status(OAUTH_TOKEN_STATUS_VALID); |
+ } else { |
+ int oauth_token_status = OAUTH_TOKEN_STATUS_UNKNOWN; |
+ if (prefs_oauth_status && |
+ prefs_oauth_status->GetIntegerWithoutPathExpansion(email, |
+ &oauth_token_status)) { |
+ user.set_oauth_token_status( |
+ static_cast<OAuthTokenStatus>(oauth_token_status)); |
+ } |
} |
UserImages::const_iterator image_it = user_images_.find(email); |