Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(613)

Unified Diff: third_party/WebKit/Source/modules/mediasession/MediaSession.h

Issue 2367393002: Migrating MediaSession messages to mojo (Closed)
Patch Set: fixed layout tests Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..458f5e08176311857709797ef6f7e2b0d8d3786b 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::MediaSessionService* getService(ScriptState*);
- std::unique_ptr<WebMediaSession> m_webMediaSession;
Member<MediaMetadata> m_metadata;
+ mojom::blink::MediaSessionServicePtr m_service;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698