Chromium Code Reviews| 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..51e795481ab3848523cd0944a7f7b29c069ca747 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. |
|
Devlin
2017/03/02 21:55:02
I don't know if this is desirable. What if I have
meacer
2017/03/07 20:50:38
Note that this CL only changes behavior for microp
|
| + if (((primary_pattern.MatchesExtensionUrls() && |
| + secondary_pattern.MatchesExtensionUrls()) || |
|
Devlin
2017/03/02 21:55:02
Some settings don't have a secondary url, or don't
meacer
2017/03/07 20:50:38
I added the secondary pattern for consistency with
|
| + (primary_pattern == ContentSettingsPattern::Wildcard() && |
| + secondary_pattern == ContentSettingsPattern::Wildcard())) && |
| !HostContentSettingsMap::IsDefaultSettingAllowedForType(setting, |
| content_type)) { |
| static const char kUnsupportedDefaultSettingError[] = |