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

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

Issue 872433006: Disconnect one click sign in code. The code itself will be removed in followup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge 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
Index: chrome/browser/signin/chrome_signin_client.cc
diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/signin/chrome_signin_client.cc
index 0d445212b476c9278dbf166eff7f4935b0acbadd..82e1663dc56d09cca95177a1f1c6156954ea6414 100644
--- a/chrome/browser/signin/chrome_signin_client.cc
+++ b/chrome/browser/signin/chrome_signin_client.cc
@@ -185,10 +185,7 @@ net::URLRequestContextGetter* ChromeSigninClient::GetURLRequestContext() {
}
bool ChromeSigninClient::ShouldMergeSigninCredentialsIntoCookieJar() {
- // If inline sign in is enabled, but account consistency is not, the user's
- // credentials should be merge into the cookie jar.
- return !switches::IsEnableWebBasedSignin() &&
- !switches::IsEnableAccountConsistency();
+ return !switches::IsEnableAccountConsistency();
}
std::string ChromeSigninClient::GetProductVersion() {
« no previous file with comments | « chrome/browser/policy/chrome_browser_policy_connector.cc ('k') | chrome/browser/signin/signin_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698