components/content_settings/core/browser/content_settings_info.cc - 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_info.cc

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

Patch Set: Address review comments (created TestUtils class) Created 5 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

« chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc ('K') | « components/content_settings/core/browser/content_settings_info.h ('k') | components/content_settings/core/browser/content_settings_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 976fec211eccb73ddd825f18154671ff542be749..62e5c685c4f146af6365279f96bacc4f5ca3c9e6 100644

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

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

@@ -11,10 +11,12 @@ namespace content_settings {

ContentSettingsInfo::ContentSettingsInfo(

const WebsiteSettingsInfo* website_settings_info,

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

- const std::set<ContentSetting>& valid_settings)

+ const std::set<ContentSetting>& valid_settings,

+ IncognitoBehavior incognito_behavior)

: website_settings_info_(website_settings_info),

whitelisted_schemes_(whitelisted_schemes),

- valid_settings_(valid_settings) {}

+ valid_settings_(valid_settings),

+ incognito_behavior_(incognito_behavior) {}

ContentSettingsInfo::~ContentSettingsInfo() {}