components/content_settings/core/browser/content_settings_registry.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_registry.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_default_provider.cc ('k') | components/content_settings/core/browser/content_settings_registry.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_registry.h

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

index 7bbd07ca29e6eb11570220f0ff4630fa08140c72..d0fcd55928412a542088741234fe281d04c31bca 100644

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

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

@@ -62,7 +62,8 @@ class ContentSettingsRegistry {

WebsiteSettingsInfo::SyncStatus sync_status,

const std::vector<std::string>& whitelisted_schemes,

const std::set<ContentSetting>& valid_settings,

- WebsiteSettingsInfo::ScopingType scoping_type);

+ WebsiteSettingsInfo::ScopingType scoping_type,

+ WebsiteSettingsInfo::IncognitoBehavior incognito_behavior);

Map content_settings_info_;

WebsiteSettingsRegistry* website_settings_registry_;