Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(992)

Unified Diff: third_party/WebKit/Source/modules/notifications/Notification.cpp

Issue 1995663003: Revert of 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
Index: third_party/WebKit/Source/modules/notifications/Notification.cpp
diff --git a/third_party/WebKit/Source/modules/notifications/Notification.cpp b/third_party/WebKit/Source/modules/notifications/Notification.cpp
index de7329221808f00230cf6e6dc74924aae282d9a3..742e78cc0765cd338cf1c1c2608d7c7642425141 100644
--- a/third_party/WebKit/Source/modules/notifications/Notification.cpp
+++ b/third_party/WebKit/Source/modules/notifications/Notification.cpp
@@ -41,7 +41,6 @@
#include "core/frame/UseCounter.h"
#include "modules/notifications/NotificationAction.h"
#include "modules/notifications/NotificationData.h"
-#include "modules/notifications/NotificationManager.h"
#include "modules/notifications/NotificationOptions.h"
#include "modules/notifications/NotificationPermissionClient.h"
#include "modules/notifications/NotificationResourcesLoader.h"
@@ -53,7 +52,6 @@
#include "public/platform/modules/notifications/WebNotificationAction.h"
#include "public/platform/modules/notifications/WebNotificationConstants.h"
#include "public/platform/modules/notifications/WebNotificationManager.h"
-#include "public/platform/modules/permissions/permission_status.mojom-blink.h"
#include "wtf/Functional.h"
namespace blink {
@@ -146,7 +144,7 @@
void Notification::prepareShow()
{
ASSERT(m_state == NotificationStateIdle);
- if (NotificationManager::from(getExecutionContext())->permissionStatus() != mojom::blink::PermissionStatus::GRANTED) {
+ if (Notification::checkPermission(getExecutionContext()) != mojom::blink::PermissionStatus::GRANTED) {
dispatchErrorEvent();
return;
}
@@ -352,7 +350,15 @@
String Notification::permission(ExecutionContext* context)
{
- return permissionString(NotificationManager::from(context)->permissionStatus());
+ return permissionString(checkPermission(context));
+}
+
+mojom::blink::PermissionStatus Notification::checkPermission(ExecutionContext* context)
+{
+ SecurityOrigin* origin = context->getSecurityOrigin();
+ ASSERT(origin);
+
+ return notificationManager()->checkPermission(WebSecurityOrigin(origin));
}
ScriptPromise Notification::requestPermission(ScriptState* scriptState, NotificationPermissionCallback* deprecatedCallback)

Powered by Google App Engine
This is Rietveld 408576698