components/content_settings/core/browser/content_settings_pref.h - Issue 1767423002: [Do not commit] Track revocations in content_settings::Observer

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_pref.h

Issue 1767423002: [Do not commit] Track revocations in content_settings::Observer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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_policy_provider.cc ('k') | components/content_settings/core/browser/content_settings_pref.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_pref.h

diff --git a/components/content_settings/core/browser/content_settings_pref.h b/components/content_settings/core/browser/content_settings_pref.h

index a49929d52d1c01b9933e9deb744745f1425584d1..62d4a1a0c36df82dee58ac5f19902992db99d137 100644

--- a/components/content_settings/core/browser/content_settings_pref.h

+++ b/components/content_settings/core/browser/content_settings_pref.h

@@ -41,6 +41,7 @@ class ContentSettingsPref {

typedef base::Callback<void(const ContentSettingsPattern&,

const ContentSettingsPattern&,

ContentSettingsType,

+ ContentSetting,

const std::string&)> NotifyObserversCallback;

ContentSettingsPref(ContentSettingsType content_type,

@@ -92,7 +93,7 @@ class ContentSettingsPref {

// value to the obsolete preference. When calling this function, |lock_|

// should not be held, since this function will send out notifications of

// preference changes.

- void UpdatePref(

+ ContentSetting UpdatePref(

const ContentSettingsPattern& primary_pattern,

const ContentSettingsPattern& secondary_pattern,

const ResourceIdentifier& resource_identifier,