chrome/browser/extensions/api/content_settings/content_settings_api.cc - Issue 2853983002: Ensure settings returned from Content Settings providers are valid

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/extensions/api/content_settings/content_settings_api.cc

Issue 2853983002: Ensure settings returned from Content Settings providers are valid (Closed)

Patch Set: Ensure settings returned from Content Settings providers are valid Created 3 years, 7 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/content_settings/host_content_settings_map_unittest.cc ('k') | components/content_settings/core/browser/content_settings_default_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

index 0ca4639996215fb63e8fbe1a96d98e4d22457e2c..efbf63b2b772d63941f12dcb0e114ef3e38d8280 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

@@ -216,8 +216,9 @@ ContentSettingsContentSettingSetFunction::Run() {

// [ask, block] for the default setting.

if (primary_pattern == ContentSettingsPattern::Wildcard() &&

secondary_pattern == ContentSettingsPattern::Wildcard() &&

- !HostContentSettingsMap::IsDefaultSettingAllowedForType(setting,

- content_type)) {

+ !content_settings::ContentSettingsRegistry::GetInstance()

+ ->Get(content_type)

+ ->IsDefaultSettingValid(setting)) {

static const char kUnsupportedDefaultSettingError[] =

"'%s' is not supported as the default setting of %s.";