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

Unified Diff: content/renderer/media/android/renderer_media_session_manager.cc

Issue 1441883003: Hook up RendererMediaSessionManager with browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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: content/renderer/media/android/renderer_media_session_manager.cc
diff --git a/content/renderer/media/android/renderer_media_session_manager.cc b/content/renderer/media/android/renderer_media_session_manager.cc
index c39c0dce2eefb66c02a5da977e8228ee2f888853..58b0888f568ab6c26eeec973081f924758c3c264 100644
--- a/content/renderer/media/android/renderer_media_session_manager.cc
+++ b/content/renderer/media/android/renderer_media_session_manager.cc
@@ -5,6 +5,8 @@
#include "content/renderer/media/android/renderer_media_session_manager.h"
#include "base/logging.h"
+#include "content/common/media/media_session_messages_android.h"
+#include "content/public/renderer/render_thread.h"
#include "content/renderer/media/android/webmediasession_android.h"
namespace content {
@@ -22,6 +24,16 @@ RendererMediaSessionManager::~RendererMediaSessionManager() {
"destroyed only after all media sessions are destroyed.";
}
+bool RendererMediaSessionManager::OnMessageReceived(const IPC::Message& msg) {
+ bool handled = true;
+ IPC_BEGIN_MESSAGE_MAP(RendererMediaSessionManager, msg)
+ IPC_MESSAGE_HANDLER(MediaSessionMsg_DidActivate, OnDidActivate)
+ IPC_MESSAGE_HANDLER(MediaSessionMsg_DidDeactivate, OnDidDeactivate)
+ IPC_MESSAGE_UNHANDLED(handled = false)
+ IPC_END_MESSAGE_MAP()
+ return handled;
+}
+
int RendererMediaSessionManager::RegisterMediaSession(
WebMediaSessionAndroid* session) {
sessions_[next_session_id_] = session;
@@ -32,4 +44,38 @@ void RendererMediaSessionManager::UnregisterMediaSession(int session_id) {
sessions_.erase(session_id);
}
+void RendererMediaSessionManager::Activate(
+ int session_id,
+ scoped_ptr<blink::WebMediaSessionActivateCallback> callback) {
+ int request_id = pending_activation_requests_.Add(callback.release());
+ Send(new MediaSessionHostMsg_Activate(routing_id(), session_id, request_id));
+}
+
+void RendererMediaSessionManager::Deactivate(
+ int session_id,
+ scoped_ptr<blink::WebMediaSessionDeactivateCallback> callback) {
+ int request_id = pending_deactivation_requests_.Add(callback.release());
+ Send(
+ new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id));
+}
+
+void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) {
+ DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id;
+ blink::WebMediaSessionActivateCallback* callback =
+ pending_activation_requests_.Lookup(request_id);
+ if (success) {
+ callback->onSuccess();
+ } else {
+ callback->onError(
+ blink::WebMediaSessionError(blink::WebMediaSessionError::Activate));
+ }
+ pending_activation_requests_.Remove(request_id);
+}
+
+void RendererMediaSessionManager::OnDidDeactivate(int request_id) {
+ DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id;
+ pending_deactivation_requests_.Lookup(request_id)->onSuccess();
+ pending_deactivation_requests_.Remove(request_id);
+}
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698