chrome/browser/android/preferences/website_preference_bridge.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/android/preferences/website_preference_bridge.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: recover ClearSetting() for user input patterns to use SetContentSetting() directly 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 | « no previous file | chrome/browser/notifications/desktop_notification_profile_util.h » ('j') | chrome/browser/notifications/message_center_settings_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/preferences/website_preference_bridge.cc

diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc

index 070514a98cd9249014f6ded70a41d745b7c55377..1243f3aa8e9752529347e1afe596116f927988da 100644

--- a/chrome/browser/android/preferences/website_preference_bridge.cc

+++ b/chrome/browser/android/preferences/website_preference_bridge.cc

@@ -340,8 +340,7 @@ static void SetNotificationSettingForOrigin(

ContentSetting setting = (ContentSetting) value;

switch (setting) {

case CONTENT_SETTING_DEFAULT:

- DesktopNotificationProfileUtil::ClearSetting(

- profile, ContentSettingsPattern::FromURLNoWildcard(url));

+ DesktopNotificationProfileUtil::ClearSetting(profile, url);

break;

case CONTENT_SETTING_ALLOW:

DesktopNotificationProfileUtil::GrantPermission(profile, url);