chrome/browser/chrome_content_browser_client.cc - Issue 542253003: Add a global on/off switch for content settings and expose a toggle on the Website Settings options…

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/chrome_content_browser_client.cc

Issue 542253003: Add a global on/off switch for content settings and expose a toggle on the Website Settings options… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@global-settings

Patch Set: Values removed from the OverrideProvider, now using an array. Created 6 years, 3 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/android/banners/app_banner_settings_helper.cc ('k') | chrome/browser/content_settings/content_settings_override_provider.h » ('j') | chrome/browser/content_settings/content_settings_override_provider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 7418ac35eaa7925aabdf9c569a610f09500d98e1..12fc1e75e65bedcd178c49ec6b2135f3cec6dafe 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -1750,12 +1750,13 @@ void ChromeContentBrowserClient::SelectClientCertificate(

<< cert_request_info->host_and_port.ToString();

Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext());

- scoped_ptr<base::Value> filter(

+ scoped_ptr<base::Value> filter =

profile->GetHostContentSettingsMap()->GetWebsiteSetting(

requesting_url,

CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,

- std::string(), NULL));

+ std::string(),

+ NULL);

if (filter.get()) {

// Try to automatically select a client certificate.