chrome/browser/push_messaging/push_messaging_notification_manager.cc - Issue 2151993002: [WebAPKs] Plumb service worker scope to 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/push_messaging/push_messaging_notification_manager.cc

Issue 2151993002: [WebAPKs] Plumb service worker scope to notifications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge branch 'master' into notification_scope Created 4 years, 5 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/platform_notification_service_unittest.cc ('k') | content/browser/notifications/notification_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/push_messaging/push_messaging_notification_manager.cc

diff --git a/chrome/browser/push_messaging/push_messaging_notification_manager.cc b/chrome/browser/push_messaging/push_messaging_notification_manager.cc

index e80db64effe85f8adc5f90611d4f98bd21dda374..da6fbda89e28452d7a7f5d3cc605a7ae59aef98e 100644

--- a/chrome/browser/push_messaging/push_messaging_notification_manager.cc

+++ b/chrome/browser/push_messaging/push_messaging_notification_manager.cc

@@ -351,9 +351,13 @@ void PushMessagingNotificationManager::DidWriteNotificationData(

return;

}

+ // Do not pass service worker scope. The origin will be used instead of the

+ // service worker scope to determine whether a notification should be

+ // attributed to a WebAPK on Android. This is OK because this code path is hit

+ // rarely.

PlatformNotificationServiceImpl::GetInstance()->DisplayPersistentNotification(

- profile_, persistent_notification_id, origin, notification_data,

- NotificationResources());

+ profile_, persistent_notification_id, GURL() /* service_worker_scope */,

+ origin, notification_data, NotificationResources());

message_handled_closure.Run();

}