Chromium Code Reviews| Index: Source/modules/push_messaging/PushController.h |
| diff --git a/Source/modules/push_messaging/PushController.h b/Source/modules/push_messaging/PushController.h |
| index 26d1e9aa5dbe28614909608a4cf7f3c137f9f8cc..b6edd28bebcc6dfa0afbd7381fbcb7167a40ff84 100644 |
| --- a/Source/modules/push_messaging/PushController.h |
| +++ b/Source/modules/push_messaging/PushController.h |
| @@ -5,7 +5,7 @@ |
| #ifndef PushController_h |
| #define PushController_h |
| -#include "core/page/Page.h" |
| +#include "core/frame/LocalFrame.h" |
| #include "platform/Supplementable.h" |
| #include "wtf/Forward.h" |
| #include "wtf/Noncopyable.h" |
| @@ -15,19 +15,19 @@ namespace blink { |
| class WebPushClient; |
| -class PushController final : public NoBaseWillBeGarbageCollected<PushController>, public WillBeHeapSupplement<Page> { |
| +class PushController final : public NoBaseWillBeGarbageCollected<PushController>, public WillBeHeapSupplement<LocalFrame> { |
|
Peter Beverloo
2014/10/29 11:25:07
This will only be used for requesting permission,
Michael van Ouwerkerk
2014/11/11 17:20:06
This will also plumb through a sender id from the
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PushController); |
| WTF_MAKE_NONCOPYABLE(PushController); |
| public: |
| static PassOwnPtrWillBeRawPtr<PushController> create(WebPushClient*); |
| static const char* supplementName(); |
| - static PushController* from(Page* page) { return static_cast<PushController*>(WillBeHeapSupplement<Page>::from(page, supplementName())); } |
| - static WebPushClient* clientFrom(Page*); |
| + static PushController* from(LocalFrame* frame) { return static_cast<PushController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName())); } |
| + static WebPushClient* clientFrom(LocalFrame*); |
| WebPushClient* client() const { return m_client; } |
|
Peter Beverloo
2014/10/29 11:25:07
nit: this should be private.
Michael van Ouwerkerk
2014/11/11 17:20:06
Actually, I think this method is not needed at all
|
| - virtual void trace(Visitor* visitor) override { WillBeHeapSupplement<Page>::trace(visitor); } |
| + virtual void trace(Visitor* visitor) override { WillBeHeapSupplement<LocalFrame>::trace(visitor); } |
| private: |
| explicit PushController(WebPushClient*); |
| @@ -35,7 +35,7 @@ private: |
| WebPushClient* m_client; |
| }; |
| -void providePushControllerTo(Page&, WebPushClient*); |
| +void providePushControllerTo(LocalFrame&, WebPushClient*); |
| } // namespace blink |