chrome/browser/notifications/message_center_settings_controller.cc - Issue 1694923004: Use GURLs instead of patterns in SetContentSetting in notifications

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/notifications/message_center_settings_controller.cc

Issue 1694923004: Use GURLs instead of patterns in SetContentSetting in notifications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scoping_set_content_setting

Patch Set: add a note Created 4 years, 9 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 | « chrome/browser/notifications/desktop_notification_profile_util.cc ('k') | chrome/browser/notifications/notification_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/message_center_settings_controller.cc

diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc

index e16109effebd6931280e14530242b4d4ef453c67..b5bcf3b3fa2530045f991d067dfe3e04e781d39d 100644

--- a/chrome/browser/notifications/message_center_settings_controller.cc

+++ b/chrome/browser/notifications/message_center_settings_controller.cc

@@ -350,8 +350,15 @@ void MessageCenterSettingsController::SetNotifierEnabled(

<< notifier.notifier_id.url.spec();

}

- if (pattern.IsValid())

- DesktopNotificationProfileUtil::ClearSetting(profile, pattern);

+ if (pattern.IsValid()) {

+ // Note that we don't use DesktopNotificationProfileUtil::ClearSetting

+ // here because pattern may from user manual input.

Bernhard Bauer 2016/03/16 10:25:22 Nit: this subordinate clause no verb 😃. "[...] bec

lshang 2016/03/16 23:56:58 Done.

+ HostContentSettingsMapFactory::GetForProfile(profile)

+ ->SetContentSetting(pattern, ContentSettingsPattern::Wildcard(),

+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS,

+ content_settings::ResourceIdentifier(),

+ CONTENT_SETTING_DEFAULT);

+ }

}

} else {

NotifierStateTrackerFactory::GetForProfile(profile)