chrome/browser/content_settings/host_content_settings_map.cc - Issue 106713004: Remove kEnableResourceContentSettings and all the code that uses it since it's been behind a flag f…

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/content_settings/host_content_settings_map.cc

Issue 106713004: Remove kEnableResourceContentSettings and all the code that uses it since it's been behind a flag f… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years 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.h ('k') | chrome/browser/content_settings/host_content_settings_map_unittest.cc » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/host_content_settings_map.cc

===================================================================

--- chrome/browser/content_settings/host_content_settings_map.cc (revision 239860)

+++ chrome/browser/content_settings/host_content_settings_map.cc (working copy)

@@ -309,7 +309,6 @@

const GURL& primary_url,

const GURL& secondary_url,

ContentSettingsType content_type,

- const std::string& resource_identifier,

ContentSetting setting) {

// TODO(markusheintz): Until the UI supports pattern pairs, both urls must

// match.

@@ -321,13 +320,13 @@

SetContentSetting(ContentSettingsPattern::FromURLNoWildcard(primary_url),

ContentSettingsPattern::Wildcard(),

content_type,

- resource_identifier,

+ std::string(),

CONTENT_SETTING_DEFAULT);

SetContentSetting(ContentSettingsPattern::FromURL(primary_url),

ContentSettingsPattern::Wildcard(),

content_type,

- resource_identifier,

+ std::string(),

setting);

}