chrome/browser/extensions/api/content_settings/content_settings_api.cc - Issue 2728503003: Update permission warning for contentSettings API

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 2728503003: Update permission warning for contentSettings API

Patch Set: chrome.contentSettings API: Do not allow wildcard patterns that match extension URLs Created 3 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 | « chrome/app/generated_resources.grd ('k') | chrome/test/data/extensions/api_test/content_settings/unsupporteddefaultsettings/test.js » ('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 c63d8f45e015fc794c3b8d4ccf7e9ed7c85be237..89c998927cb4a09e0def284b3282faee203bb550 100644

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

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

@@ -214,8 +214,11 @@ ContentSettingsContentSettingSetFunction::Run() {

// some values might not be supported.

// For example, camera supports [allow, ask, block] for exceptions, but only

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

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

- secondary_pattern == ContentSettingsPattern::Wildcard() &&

+ // Also, do not allow wildcard patterns that match chrome-extension URLs.

+ if ((primary_pattern.MatchesExtensionUrls() &&

+ secondary_pattern.MatchesExtensionUrls()) ||

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

+ secondary_pattern == ContentSettingsPattern::Wildcard())) &&

!HostContentSettingsMap::IsDefaultSettingAllowedForType(setting,

content_type)) {

static const char kUnsupportedDefaultSettingError[] =