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

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

Issue 614973002: Extract LoginPerformer to chromeos/auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Yet another merge Created 6 years, 2 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/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 de2ea43d9dff7611163003e0b5b2434c2474cf40..5d639d421c1c27a817e47912c85f1e3de77c5bf3 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -787,7 +787,7 @@ void UserSessionManager::UserProfileInitialized(Profile* profile,
const bool transfer_auth_cookies_and_channel_ids_on_first_login =
has_auth_cookies_;
ProfileAuthData::Transfer(
- authenticator_->authentication_profile(),
+ authenticator_->authentication_context(),
profile,
transfer_auth_cookies_and_channel_ids_on_first_login,
transfer_saml_auth_cookies_on_subsequent_login,
@@ -903,7 +903,7 @@ void UserSessionManager::InitSessionRestoreStrategy() {
void UserSessionManager::RestoreAuthSessionImpl(Profile* profile,
bool restore_from_auth_cookies) {
Nikita (slow) 2014/10/20 12:30:27 nit: Please fix indentation (I known it's not your
- CHECK((authenticator_.get() && authenticator_->authentication_profile()) ||
+ CHECK((authenticator_.get() && authenticator_->authentication_context()) ||
!restore_from_auth_cookies);
if (chrome::IsRunningInForcedAppMode() ||
@@ -921,8 +921,8 @@ void UserSessionManager::RestoreAuthSessionImpl(Profile* profile,
OAuth2LoginManagerFactory::GetInstance()->GetForProfile(profile);
login_manager->AddObserver(this);
login_manager->RestoreSession(
- authenticator_.get() && authenticator_->authentication_profile()
- ? authenticator_->authentication_profile()->GetRequestContext()
+ authenticator_.get() && authenticator_->authentication_context()
+ ? authenticator_->authentication_context()->GetRequestContext()
: NULL,
session_restore_strategy_,
oauth2_refresh_token_,

Powered by Google App Engine
This is Rietveld 408576698