chrome/browser/extensions/api/content_settings/content_settings_api.cc - Issue 1320673013: Remove HostContentSettingsMap::IsSettingAllowedForType

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 1320673013: Remove HostContentSettingsMap::IsSettingAllowedForType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-issetting-allowed

Patch Set: Created 5 years, 2 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') | chrome/browser/profile_resetter/profile_resetter.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 4d41984ed54b11e5b088e84f1d6e4c326dfb1c1a..bad9a3193076e6002c44a626b4881e44736dfcb0 100644

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

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

@@ -25,6 +25,8 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/api/content_settings.h"

+#include "components/content_settings/core/browser/content_settings_info.h"

+#include "components/content_settings/core/browser/content_settings_registry.h"

#include "components/content_settings/core/browser/content_settings_utils.h"

#include "components/content_settings/core/browser/cookie_settings.h"

#include "components/content_settings/core/browser/host_content_settings_map.h"

@@ -212,8 +214,10 @@ bool ContentSettingsContentSettingSetFunction::RunSync() {

ContentSetting setting;

EXTENSION_FUNCTION_VALIDATE(

content_settings::ContentSettingFromString(setting_str, &setting));

- EXTENSION_FUNCTION_VALIDATE(HostContentSettingsMap::IsSettingAllowedForType(

- GetProfile()->GetPrefs(), setting, content_type));

+ EXTENSION_FUNCTION_VALIDATE(

+ content_settings::ContentSettingsRegistry::GetInstance()

+ ->Get(content_type)

+ ->IsSettingValid(setting));

// Some content setting types support the full set of values listed in

// content_settings.json only for exceptions. For the default setting,

@@ -222,8 +226,8 @@ bool ContentSettingsContentSettingSetFunction::RunSync() {

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

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

secondary_pattern == ContentSettingsPattern::Wildcard() &&

- !HostContentSettingsMap::IsDefaultSettingAllowedForType(

- GetProfile()->GetPrefs(), setting, content_type)) {

+ !HostContentSettingsMap::IsDefaultSettingAllowedForType(setting,

+ content_type)) {

static const char kUnsupportedDefaultSettingError[] =

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