Chromium Code Reviews| Index: third_party/WebKit/Source/modules/mediasession/MediaSession.h |
| diff --git a/third_party/WebKit/Source/modules/mediasession/MediaSession.h b/third_party/WebKit/Source/modules/mediasession/MediaSession.h |
| index d41724159b7d86fdb6aa09d01fdf4403868c6fee..82a5e8ae98d5067f96c3c0c295b8a9c83f9d7833 100644 |
| --- a/third_party/WebKit/Source/modules/mediasession/MediaSession.h |
| +++ b/third_party/WebKit/Source/modules/mediasession/MediaSession.h |
| @@ -8,6 +8,7 @@ |
| #include "bindings/core/v8/ScriptWrappable.h" |
| #include "core/events/EventTarget.h" |
| #include "modules/ModulesExport.h" |
| +#include "mojo/public/cpp/bindings/binding.h" |
| #include "platform/heap/Handle.h" |
| #include "public/platform/modules/mediasession/media_session.mojom-blink.h" |
| #include <memory> |
| @@ -17,7 +18,9 @@ namespace blink { |
| class MediaMetadata; |
| class ScriptState; |
| -class MODULES_EXPORT MediaSession final : public EventTargetWithInlineData { |
| +class MODULES_EXPORT MediaSession final |
| + : public EventTargetWithInlineData, |
| + blink::mojom::blink::MediaSessionClient { |
| DEFINE_WRAPPERTYPEINFO(); |
|
haraken
2016/10/17 22:37:05
You need to add USING_PRE_FINALIZER and clear m_cl
Zhiqiang Zhang (Slow)
2016/10/18 14:42:14
Thanks! Done.
|
| public: |
| @@ -54,12 +57,16 @@ class MODULES_EXPORT MediaSession final : public EventTargetWithInlineData { |
| const EventListener*, |
| const EventListenerOptions&) override; |
| + // blink::mojom::blink::MediaSessionClient implementation. |
| + void DidReceivedAction(blink::mojom::blink::MediaSessionAction) override; |
| + |
| // Returns null when the ExecutionContext is not document. |
| mojom::blink::MediaSessionService* getService(ScriptState*); |
| RefPtr<ScriptState> m_scriptState; |
| Member<MediaMetadata> m_metadata; |
| mojom::blink::MediaSessionServicePtr m_service; |
| + mojo::Binding<blink::mojom::blink::MediaSessionClient> m_clientBinding; |
| }; |
| } // namespace blink |