| 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 32470033d25d71e78df11aa6a163ca097f976d68..e3d7f25baf96803b23e04897d5e36a9d897af80a 100644
|
| --- a/third_party/WebKit/Source/modules/mediasession/MediaSession.h
|
| +++ b/third_party/WebKit/Source/modules/mediasession/MediaSession.h
|
| @@ -5,11 +5,10 @@
|
| #ifndef MediaSession_h
|
| #define MediaSession_h
|
|
|
| -#include "bindings/core/v8/ScriptPromise.h"
|
| #include "bindings/core/v8/ScriptWrappable.h"
|
| #include "modules/ModulesExport.h"
|
| #include "platform/heap/Handle.h"
|
| -#include "public/platform/modules/mediasession/WebMediaSession.h"
|
| +#include "public/platform/modules/mediasession/media_session.mojom-blink.h"
|
| #include <memory>
|
|
|
| namespace blink {
|
| @@ -23,25 +22,23 @@ class MODULES_EXPORT MediaSession final
|
| DEFINE_WRAPPERTYPEINFO();
|
|
|
| public:
|
| - static MediaSession* create(ExecutionContext*, ExceptionState&);
|
| + static MediaSession* create();
|
|
|
| - WebMediaSession* getWebMediaSession() { return m_webMediaSession.get(); }
|
| -
|
| - ScriptPromise activate(ScriptState*);
|
| - ScriptPromise deactivate(ScriptState*);
|
| -
|
| - void setMetadata(MediaMetadata*);
|
| - MediaMetadata* metadata() const;
|
| + void setMetadata(ScriptState*, MediaMetadata*);
|
| + MediaMetadata* metadata(ScriptState*) const;
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| friend class MediaSessionTest;
|
|
|
| - explicit MediaSession(std::unique_ptr<WebMediaSession>);
|
| + MediaSession();
|
| +
|
| + // Returns null when the ExecutionContext is not document.
|
| + mojom::blink::MediaSession* getService(ScriptState*);
|
|
|
| - std::unique_ptr<WebMediaSession> m_webMediaSession;
|
| Member<MediaMetadata> m_metadata;
|
| + mojom::blink::MediaSessionPtr m_service;
|
| };
|
|
|
| } // namespace blink
|
|
|