chrome/browser/notifications/platform_notification_service_impl.cc - Issue 1034143002: Content settings clean-up: Clarify resource identifier & get rid of NO_RESOURCE_IDENTIFIER.

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/platform_notification_service_impl.cc

Issue 1034143002: Content settings clean-up: Clarify resource identifier & get rid of NO_RESOURCE_IDENTIFIER. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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') | components/content_settings/core/browser/content_settings_policy_provider.cc » ('j') | components/content_settings/core/common/content_settings.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/platform_notification_service_impl.cc

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

index 8b8136942c41f37b3988226f8d5eb8a3a393cb3c..f30f8c4e6f785964b2f59d92df28bfa82480c2a5 100644

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

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

@@ -176,10 +176,8 @@ PlatformNotificationServiceImpl::CheckPermissionOnIOThread(

HostContentSettingsMap* host_content_settings_map =

io_data->GetHostContentSettingsMap();

ContentSetting setting = host_content_settings_map->GetContentSetting(

- origin,

- CONTENT_SETTINGS_TYPE_NOTIFICATIONS,

- NO_RESOURCE_IDENTIFIER);

+ origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,

+ NoResourceIdentifier::GetResourceIdentifier());

markusheintz_ 2015/03/27 10:27:34 nit: Please put each param back into a single line

Deepak 2015/03/27 11:40:04 Done.

if (setting == CONTENT_SETTING_ALLOW)

return blink::WebNotificationPermissionAllowed;