Chromium Code Reviews| Index: third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.h |
| diff --git a/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.h b/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.h |
| index 0458704dab21fea73bcfa3dfff6512fc2d51770e..58641e7db3ccee3a5dbb8d3e5b434511ee5ee818 100644 |
| --- a/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.h |
| +++ b/third_party/WebKit/Source/modules/remoteplayback/RemotePlayback.h |
| @@ -5,9 +5,10 @@ |
| #ifndef RemotePlayback_h |
| #define RemotePlayback_h |
| +#include "bindings/core/v8/ActiveScriptWrappable.h" |
| #include "bindings/core/v8/ScriptPromise.h" |
| #include "core/events/EventTarget.h" |
| -#include "core/frame/DOMWindowProperty.h" |
| +#include "core/frame/LocalFrameLifecycleObserver.h" |
| #include "platform/heap/Handle.h" |
| #include "public/platform/modules/remoteplayback/WebRemotePlaybackClient.h" |
| #include "public/platform/modules/remoteplayback/WebRemotePlaybackState.h" |
| @@ -24,7 +25,8 @@ class ScriptPromiseResolver; |
| class RemotePlayback final |
| : public EventTargetWithInlineData |
| - , public DOMWindowProperty |
| + , public ActiveScriptWrappable |
| + , public LocalFrameLifecycleObserver |
|
haraken
2016/06/02 23:53:52
Would you help me understand why this needs to be
whywhat
2016/06/03 13:29:38
It was a natural switch from DOMWindowPropery to b
|
| , private WebRemotePlaybackClient { |
| DEFINE_WRAPPERTYPEINFO(); |
| USING_GARBAGE_COLLECTED_MIXIN(RemotePlayback); |
| @@ -40,6 +42,9 @@ public: |
| String state() const; |
| + // ActiveScriptWrappable implementation. |
| + bool hasPendingActivity() const final; |
| + |
| DEFINE_ATTRIBUTE_EVENT_LISTENER(statechange); |
| DECLARE_VIRTUAL_TRACE(); |