components/content_settings/core/browser/content_settings_default_provider.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_default_provider.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: Move GetContentSettingValueAndPatterns to HostContentSettingsMap, and address other review comments 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

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

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

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

index 90531a5795644596733a9027d393632c012f93c5..40c1ed491c2cf932dabb36daa06f2ec0a3e0ac1e 100644

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

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

@@ -260,6 +260,10 @@ scoped_ptr<RuleIterator> DefaultProvider::GetRuleIterator(

ContentSettingsType content_type,

const ResourceIdentifier& resource_identifier,

bool incognito) const {

+ // The default provider never has incognito-specific settings.

+ if (incognito)

+ return scoped_ptr<RuleIterator>(new EmptyRuleIterator());

base::AutoLock lock(lock_);

if (resource_identifier.empty()) {

auto it(default_settings_.find(content_type));