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

Unified Diff: chrome/browser/signin/signin_manager.cc

Issue 131973004: Eliminate usage of PO2TS::GetPrimaryAccountID() in UbertokenFetcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile failure Created 6 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 | « chrome/browser/signin/google_auto_login_helper.cc ('k') | chrome/browser/signin/ubertoken_fetcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/signin_manager.cc
diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc
index f76a94bf226db95426e276b2fdeeb91319c28573..23d5c92fc21378e88b6eae12e97cfc4fc8f728c0 100644
--- a/chrome/browser/signin/signin_manager.cc
+++ b/chrome/browser/signin/signin_manager.cc
@@ -590,7 +590,7 @@ void SigninManager::CompletePendingSignin() {
temp_oauth_login_tokens_ = ClientOAuthResult();
if (do_merge_session_in_signin_manager)
- merge_session_helper_->LogIn();
+ merge_session_helper_->LogIn(GetAuthenticatedUsername());
}
void SigninManager::OnExternalSigninCompleted(const std::string& username) {
« no previous file with comments | « chrome/browser/signin/google_auto_login_helper.cc ('k') | chrome/browser/signin/ubertoken_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698