components/content_settings/core/browser/website_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/website_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: Annotate bool parameters 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/host_content_settings_map.cc ('K') | « components/content_settings/core/browser/website_settings_info.h ('k') | components/content_settings/core/browser/website_settings_registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4bffcb830311d1fa7295ed1cc8b52aa160517864..f3c43db8f393676a51f1f982e0cf4349cb1b00e6 100644

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

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

@@ -31,7 +31,8 @@ WebsiteSettingsInfo::WebsiteSettingsInfo(

scoped_ptr<base::Value> initial_default_value,

SyncStatus sync_status,

LossyStatus lossy_status,

- ScopingType scoping_type)

+ ScopingType scoping_type,

+ IncognitoBehavior incognito_behavior)

: type_(type),

name_(name),

pref_name_(GetPrefName(name, kPrefPrefix)),

@@ -39,7 +40,8 @@ WebsiteSettingsInfo::WebsiteSettingsInfo(

initial_default_value_(initial_default_value.Pass()),

sync_status_(sync_status),

lossy_status_(lossy_status),

- scoping_type_(scoping_type) {

+ scoping_type_(scoping_type),

+ incognito_behavior_(incognito_behavior) {

// For legacy reasons the default value is currently restricted to be an int.

// TODO(raymes): We should migrate the underlying pref to be a dictionary

// rather than an int.