| Index: content/renderer/notification_permission_dispatcher.h
|
| diff --git a/content/renderer/notification_permission_dispatcher.h b/content/renderer/notification_permission_dispatcher.h
|
| index 5c32693b18a7295e3a1fb12cbd14f7b3b9efddcd..bb3430fe1f52aa409bde5abb16bff774d0bda318 100644
|
| --- a/content/renderer/notification_permission_dispatcher.h
|
| +++ b/content/renderer/notification_permission_dispatcher.h
|
| @@ -5,7 +5,7 @@
|
| #ifndef CONTENT_RENDERER_NOTIFICATION_PERMISSION_DISPATCHER_H_
|
| #define CONTENT_RENDERER_NOTIFICATION_PERMISSION_DISPATCHER_H_
|
|
|
| -#include "base/id_map.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "content/common/permission_service.mojom.h"
|
| #include "content/public/renderer/render_frame_observer.h"
|
|
|
| @@ -16,6 +16,8 @@ class WebSecurityOrigin;
|
|
|
| namespace content {
|
|
|
| +class RenderFrame;
|
| +
|
| // Dispatcher for Web Notification permission requests.
|
| class NotificationPermissionDispatcher : public RenderFrameObserver {
|
| public:
|
| @@ -25,18 +27,13 @@ class NotificationPermissionDispatcher : public RenderFrameObserver {
|
| // Requests permission to display Web Notifications for |origin|. The callback
|
| // will be invoked when the permission status is available. This class will
|
| // take ownership of |callback|.
|
| - void RequestPermission(
|
| - const blink::WebSecurityOrigin& origin,
|
| - blink::WebNotificationPermissionCallback* callback);
|
| + void RequestPermission(const blink::WebSecurityOrigin& origin,
|
| + blink::WebNotificationPermissionCallback* callback);
|
|
|
| private:
|
| void OnPermissionRequestComplete(
|
| - int request_id, PermissionStatus status);
|
| -
|
| - // Tracks the active notification permission requests. This class takes
|
| - // ownership of the created WebNotificationPermissionCallback objects.
|
| - IDMap<blink::WebNotificationPermissionCallback, IDMapOwnPointer>
|
| - pending_requests_;
|
| + scoped_ptr<blink::WebNotificationPermissionCallback> callback,
|
| + PermissionStatus status);
|
|
|
| PermissionServicePtr permission_service_;
|
|
|
|
|