components/content_settings/core/browser/content_settings_policy_provider.cc - Issue 1034143002: Content settings clean-up: Clarify resource identifier & get rid of NO_RESOURCE_IDENTIFIER.

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: components/content_settings/core/browser/content_settings_policy_provider.cc

Issue 1034143002: Content settings clean-up: Clarify resource identifier & get rid of NO_RESOURCE_IDENTIFIER. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing nit. Created 5 years, 8 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 | « components/content_settings/core/browser/content_settings_origin_identifier_value_map.h ('k') | components/content_settings/core/browser/content_settings_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_policy_provider.cc

diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc

index 445a4ad817acb9dc3245632123203392d074ecd2..8c65dbd0ce54721f2b8263cf49bfd450539fa15e 100644

--- a/components/content_settings/core/browser/content_settings_policy_provider.cc

+++ b/components/content_settings/core/browser/content_settings_policy_provider.cc

@@ -284,10 +284,8 @@ void PolicyProvider::GetContentSettingsFromPreferences(

ContentSettingsPattern secondary_pattern =

!pattern_pair.second.IsValid() ? ContentSettingsPattern::Wildcard()

: pattern_pair.second;

- value_map->SetValue(pattern_pair.first,

- secondary_pattern,

- content_type,

- NO_RESOURCE_IDENTIFIER,

+ value_map->SetValue(pattern_pair.first, secondary_pattern, content_type,

+ ResourceIdentifier(),

new base::FundamentalValue(

kPrefsForManagedContentSettingsMap[i].setting));

}