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

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

Issue 2642783002: Set that Active Directory users can't sync images (Closed)
Patch Set: comment Created 3 years, 11 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 | components/user_manager/user.cc » ('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 3c52046689839bc63ea23097a1033da262fd039e..e4a0cb8f2f5f17d7e367184b8e37cf0cf74a2ebf 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -1117,10 +1117,11 @@ void UserSessionManager::UserProfileInitialized(Profile* profile,
}
if (user_context_.GetAuthFlow() == UserContext::AUTH_FLOW_ACTIVE_DIRECTORY) {
+ // Call FinalizePrepareProfile directly and skip RestoreAuthSessionImpl
+ // because there is no need to merge session for Active Directory users.
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(&UserSessionManager::CompleteProfileCreateAfterAuthTransfer,
- AsWeakPtr(), profile));
+ FROM_HERE, base::Bind(&UserSessionManager::FinalizePrepareProfile,
+ AsWeakPtr(), profile));
return;
}
« no previous file with comments | « no previous file | components/user_manager/user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698