third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp - Issue 1948223004: Introduce the Blink NotificationService, move permission checks there

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: third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp

Issue 1948223004: Introduce the Blink NotificationService, move permission checks there (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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

« content/browser/notifications/platform_notification_context_impl.cc ('K') | « third_party/WebKit/Source/modules/notifications/NotificationManager.cpp ('k') | third_party/WebKit/public/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp

diff --git a/third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp b/third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp

index c2aafb1a1eb82875faade6f3ab7dca5ce7e27e55..5ef92123bcadfe2bd22e9a2ef7dcf8f8dfdbc6cd 100644

--- a/third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp

+++ b/third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp

@@ -11,6 +11,7 @@

#include "modules/notifications/GetNotificationOptions.h"

#include "modules/notifications/Notification.h"

#include "modules/notifications/NotificationData.h"

+#include "modules/notifications/NotificationManager.h"

#include "modules/notifications/NotificationOptions.h"

#include "modules/notifications/NotificationResourcesLoader.h"

#include "modules/serviceworkers/ServiceWorkerRegistration.h"

@@ -59,7 +60,7 @@ ScriptPromise ServiceWorkerRegistrationNotifications::showNotification(ScriptSta

return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "No active registration available on the ServiceWorkerRegistration."));

// If permission for notification's origin is not "granted", reject promise with a TypeError exception, and terminate these substeps.

- if (Notification::checkPermission(executionContext) != mojom::blink::PermissionStatus::GRANTED)

+ if (NotificationManager::from(executionContext)->permissionStatus() != mojom::blink::PermissionStatus::GRANTED)

return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "No notification permission has been granted for this origin."));

// Validate the developer-provided values to get a WebNotificationData object.