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

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

Issue 1137253003: cros: Fix session restore on connection change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move PREPARE state setting to ContinueSessionRestore and cover it on connection change Created 5 years, 7 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 | « no previous file | chrome/browser/chromeos/login/signin/oauth2_login_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 5b3ade225c1f357f34c3b5e3c863858ee8c95e52..edecf3a3207452a1d459eb3acaaa385835ab11b2 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -762,8 +762,7 @@ void UserSessionManager::OnConnectionTypeChanged(
pending_signin_restore_sessions_.end();
OAuth2LoginManager* login_manager =
OAuth2LoginManagerFactory::GetInstance()->GetForProfile(user_profile);
- if (login_manager->state() ==
- OAuth2LoginManager::SESSION_RESTORE_IN_PROGRESS) {
+ if (login_manager->SessionRestoreIsRunning()) {
// If we come online for the first time after successful offline login,
// we need to kick off OAuth token verification process again.
login_manager->ContinueSessionRestore();
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/signin/oauth2_login_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698