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

Unified Diff: chrome/browser/ui/webui/signin/inline_login_handler_impl.cc

Issue 913123005: Reauth causes a MergeSession, so the cookie jar gets re-authed too. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pre-review checkup Created 5 years, 10 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/signin/core/browser/signin_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
index d9ed6882a2324458d01520760ef12797b0cd1eb0..f58baf7535e8cf16462aaace5fbc3ca59e2a001c 100644
--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
@@ -133,8 +133,8 @@ void InlineSigninHelper::OnClientOAuthSuccess(const ClientOAuthResult& result) {
signin_metrics::Source source = signin::GetSourceForPromoURL(current_url_);
- std::string primary_email =
- SigninManagerFactory::GetForProfile(profile_)->GetAuthenticatedUsername();
+ SigninManager* signin_manager = SigninManagerFactory::GetForProfile(profile_);
+ std::string primary_email = signin_manager->GetAuthenticatedUsername();
if (gaia::AreEmailsSame(email_, primary_email) &&
source == signin_metrics::SOURCE_REAUTH &&
switches::IsNewProfileManagement() &&
@@ -157,6 +157,9 @@ void InlineSigninHelper::OnClientOAuthSuccess(const ClientOAuthResult& result) {
handler_,
signin::ShouldShowAccountManagement(current_url_)));
}
+
+ if (source == signin_metrics::SOURCE_REAUTH)
+ signin_manager->MergeSigninCredentialIntoCookieJar();
} else {
ProfileSyncService* sync_service =
ProfileSyncServiceFactory::GetForProfile(profile_);
« no previous file with comments | « no previous file | components/signin/core/browser/signin_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698