chrome/browser/content_settings/content_settings_extension_provider.cc - Issue 7655019: Migrate Obsolete NotificationsSettings and remove content_settings::NotificationsProvider.

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: chrome/browser/content_settings/content_settings_extension_provider.cc

Issue 7655019: Migrate Obsolete NotificationsSettings and remove content_settings::NotificationsProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: " Created 9 years, 4 months 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 | « no previous file | chrome/browser/content_settings/content_settings_notification_provider.h » ('j') | chrome/browser/content_settings/content_settings_pref_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_extension_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_extension_provider.cc b/chrome/browser/content_settings/content_settings_extension_provider.cc

index 10c94bd3fcc7a85a426c31de8e3ae4050a3a8574..18182dcf34b91c6e9ab0f93d6cb990ffb80bbd98 100644

--- a/chrome/browser/content_settings/content_settings_extension_provider.cc

+++ b/chrome/browser/content_settings/content_settings_extension_provider.cc

@@ -29,12 +29,14 @@ ContentSetting ExtensionProvider::GetContentSetting(

// TODO(markusheintz): Instead of getting the effective setting every time

// effective patterns could be cached in here.

DCHECK(extensions_settings_);

- return extensions_settings_->GetEffectiveContentSetting(

+ ContentSetting setting = extensions_settings_->GetEffectiveContentSetting(

embedded_url,

top_level_url,

content_type,

resource_identifier,

incognito_);

battre 2011/08/29 17:44:04 nit: is this really better?

markusheintz_ 2011/08/30 15:14:02 Ahhhh no not at all. I just did this to LOG the se

+ return setting;

}

void ExtensionProvider::GetAllContentSettingsRules(