| Index: third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.h
|
| diff --git a/third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.h b/third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.h
|
| index 391e789ecd7d822442dd059a7c261623a1597d2f..8adaf1f8fdb714a25808038c7a96706750c232fa 100644
|
| --- a/third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.h
|
| +++ b/third_party/WebKit/Source/modules/notifications/ServiceWorkerRegistrationNotifications.h
|
| @@ -12,11 +12,9 @@
|
| #include "platform/heap/Handle.h"
|
| #include "platform/heap/HeapAllocator.h"
|
| #include "platform/heap/Visitor.h"
|
| -#include "public/platform/modules/notifications/WebNotificationManager.h"
|
| +#include "public/platform/modules/notifications/notification.mojom-blink.h"
|
| +#include "public/platform/modules/notifications/notification_service.mojom-blink.h"
|
| #include "wtf/Noncopyable.h"
|
| -#include "wtf/OwnPtr.h"
|
| -#include "wtf/PassOwnPtr.h"
|
| -#include "wtf/PassRefPtr.h"
|
|
|
| namespace blink {
|
|
|
| @@ -26,13 +24,12 @@ class GetNotificationOptions;
|
| class NotificationOptions;
|
| class NotificationResourcesLoader;
|
| class ScriptState;
|
| -class SecurityOrigin;
|
| class ServiceWorkerRegistration;
|
| -struct WebNotificationData;
|
|
|
| class ServiceWorkerRegistrationNotifications final : public GarbageCollectedFinalized<ServiceWorkerRegistrationNotifications>, public Supplement<ServiceWorkerRegistration>, public ContextLifecycleObserver {
|
| USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerRegistrationNotifications);
|
| WTF_MAKE_NONCOPYABLE(ServiceWorkerRegistrationNotifications);
|
| +
|
| public:
|
| ~ServiceWorkerRegistrationNotifications();
|
| static ScriptPromise showNotification(ScriptState*, ServiceWorkerRegistration&, const String& title, const NotificationOptions&, ExceptionState&);
|
| @@ -49,8 +46,8 @@ private:
|
| static const char* supplementName();
|
| static ServiceWorkerRegistrationNotifications& from(ExecutionContext*, ServiceWorkerRegistration&);
|
|
|
| - void prepareShow(const WebNotificationData&, PassOwnPtr<WebNotificationShowCallbacks>);
|
| - void didLoadResources(PassRefPtr<SecurityOrigin>, const WebNotificationData&, PassOwnPtr<WebNotificationShowCallbacks>, NotificationResourcesLoader*);
|
| + void prepareShow(mojom::blink::NotificationPtr, const mojom::blink::NotificationService::DisplayPersistentCallback& callback);
|
| + void didLoadResources(const mojom::blink::NotificationService::DisplayPersistentCallback& callback, NotificationResourcesLoader*, mojom::blink::NotificationPtr notification);
|
|
|
| Member<ServiceWorkerRegistration> m_registration;
|
| HeapHashSet<Member<NotificationResourcesLoader>> m_loaders;
|
|
|