chrome/browser/signin/chrome_signin_client.cc - Issue 872433006: Disconnect one click sign in code. The code itself will be removed in followup

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: rebased Created 5 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

« chrome/browser/password_manager/save_password_infobar_delegate.cc ('K') | « chrome/browser/policy/chrome_browser_policy_connector.cc ('k') | chrome/browser/signin/signin_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d3d2746e022943d0d0ff3a2b5c38cb838fe2619b..26ef372b8e6d63e08cfe5329a4b7579c1fb873c0 100644

--- a/chrome/browser/signin/chrome_signin_client.cc

+++ b/chrome/browser/signin/chrome_signin_client.cc

@@ -179,10 +179,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() {