components/content_settings/core/browser/content_settings_utils.h - Issue 1442083002: Stop inheriting push notification permissions from regular to incognito

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

Issue 1442083002: Stop inheriting push notification permissions from regular to incognito (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed mvanouwerkerk's review comments Created 5 years, 1 month 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

« components/content_settings/core/browser/content_settings_default_provider.cc ('K') | « components/content_settings/core/browser/content_settings_registry.cc ('k') | components/content_settings/core/browser/content_settings_utils.cc » ('j') | components/content_settings/core/browser/content_settings_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e27734ba5598828594ba1f54e6c9a6b814ef74b0..0ec2e2e2b33ffb4b58df7ba47c1385fd1b6a4659 100644

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

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

@@ -78,7 +78,7 @@ std::string CreatePatternString(

const ContentSettingsPattern& top_level_frame_pattern);

// Caller takes the ownership of the returned |base::Value*|.

-base::Value* GetContentSettingValueAndPatterns(

+scoped_ptr<base::Value> GetContentSettingValueAndPatterns(

RuleIterator* rule_iterator,

const GURL& primary_url,

const GURL& secondary_url,

@@ -89,7 +89,7 @@ base::Value* GetContentSettingValueAndPatterns(

// a valid content setting. Otherwise, returns a nullptr.

scoped_ptr<base::Value> ContentSettingToValue(ContentSetting setting);

-base::Value* GetContentSettingValueAndPatterns(

+scoped_ptr<base::Value> GetContentSettingValueAndPatterns(

const ProviderInterface* provider,

const GURL& primary_url,

const GURL& secondary_url,