chrome/browser/chromeos/login/session/user_session_manager.cc - Issue 1102863002: Revert of Fetch OAuth2 tokens prior to profile creation.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 1102863002: Revert of Fetch OAuth2 tokens prior to profile creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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

« no previous file with comments | « chrome/browser/chromeos/login/saml/saml_browsertest.cc ('k') | chrome/browser/chromeos/login/signin/oauth2_login_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/session/user_session_manager.cc

diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc

index b7765520aeeaf741aa9aef932756a719277bca47..888fa5fea3b1aa1a6aa9fc1fafd7b1fbf4f27d79 100644

--- a/chrome/browser/chromeos/login/session/user_session_manager.cc

+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc

@@ -1218,6 +1218,8 @@

if (has_auth_cookies_) {

session_restore_strategy_ = OAuth2LoginManager::RESTORE_FROM_COOKIE_JAR;

+ } else if (!user_context_.GetAuthCode().empty()) {

+ session_restore_strategy_ = OAuth2LoginManager::RESTORE_FROM_AUTH_CODE;

} else if (!user_context_.GetRefreshToken().empty()) {

session_restore_strategy_ =

OAuth2LoginManager::RESTORE_FROM_PASSED_OAUTH2_REFRESH_TOKEN;

@@ -1265,7 +1267,7 @@

}

login_manager->RestoreSession(auth_request_context, session_restore_strategy_,

user_context_.GetRefreshToken(),

- user_context_.GetAccessToken());

+ user_context_.GetAuthCode());

}

void UserSessionManager::InitRlzImpl(Profile* profile, bool disabled) {