diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-05 21:02:57 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-05 21:02:57 +0000 |
| commit | 5ecbc00e7e71b0c072bb782f9ccbfbbdc5b86bf4 (patch) | |
| tree | fe1cb5d5f3ab49e61c21afe7af3fec73bfca3834 | |
| parent | 37b59df243cd823fbb39f1ca68a3ed609db890cb (diff) | |
| download | chromium_src-5ecbc00e7e71b0c072bb782f9ccbfbbdc5b86bf4.zip chromium_src-5ecbc00e7e71b0c072bb782f9ccbfbbdc5b86bf4.tar.gz chromium_src-5ecbc00e7e71b0c072bb782f9ccbfbbdc5b86bf4.tar.bz2 | |
Merge 95653 - [ChromeOS] Fake OAUTH_TOKEN_STATUS_VALID when "--skip-oauth-login" is set.
BUG=chromium-os:18740
TEST=Add "--skip-oauth-login" in command line and focusing on user pod should stay, i.e. no auto switching to Gaia.
Review URL: http://codereview.chromium.org/7583010
TBR=zelidrag@chromium.org
Review URL: http://codereview.chromium.org/7591002
git-svn-id: svn://svn.chromium.org/chrome/branches/835/src@95654 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/user_manager.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc index aebcec9..088951a 100644 --- a/chrome/browser/chromeos/login/user_manager.cc +++ b/chrome/browser/chromeos/login/user_manager.cc @@ -288,12 +288,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); |