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

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

Issue 2003023002: Introduce the Blink NotificationService, move permission checks there (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 d8ea5a296b7f952382fd468ee0cf3d64be9dd151..4ee070f2bd52958473532ac5b002f99237be5c81 100644
--- a/third_party/WebKit/Source/modules/notifications/Notification.cpp
+++ b/third_party/WebKit/Source/modules/notifications/Notification.cpp
@@ -41,6 +41,7 @@
#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"
@@ -52,6 +53,7 @@
#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/Assertions.h"
#include "wtf/Functional.h"
@@ -145,7 +147,7 @@ void Notification::schedulePrepareShow()
void Notification::prepareShow()
{
DCHECK_EQ(m_state, NotificationStateIdle);
- if (Notification::checkPermission(getExecutionContext()) != mojom::blink::PermissionStatus::GRANTED) {
+ if (NotificationManager::from(getExecutionContext())->permissionStatus() != mojom::blink::PermissionStatus::GRANTED) {
dispatchErrorEvent();
return;
}
@@ -345,15 +347,7 @@ String Notification::permissionString(mojom::blink::PermissionStatus permission)
String Notification::permission(ExecutionContext* context)
{
- return permissionString(checkPermission(context));
-}
-
-mojom::blink::PermissionStatus Notification::checkPermission(ExecutionContext* context)
-{
- SecurityOrigin* origin = context->getSecurityOrigin();
- DCHECK(origin);
-
- return notificationManager()->checkPermission(WebSecurityOrigin(origin));
+ return permissionString(NotificationManager::from(context)->permissionStatus());
}
ScriptPromise Notification::requestPermission(ScriptState* scriptState, NotificationPermissionCallback* deprecatedCallback)

Powered by Google App Engine
This is Rietveld 408576698