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..371f665027fd9c2f5fae83c1612b203303f07d52 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,34 @@ void RendererMediaSessionManager::UnregisterMediaSession(int session_id) { |
sessions_.erase(session_id); |
} |
+void RendererMediaSessionManager::Activate(int session_id, int activation_id) { |
+ Send(new MediaSessionHostMsg_Activate(routing_id(), session_id, |
+ activation_id)); |
mlamouri (slow - plz ping)
2015/12/02 15:53:31
nit: request_id
davve
2015/12/04 12:43:09
Done.
|
+} |
+ |
+void RendererMediaSessionManager::Deactivate(int session_id, |
+ int deactivation_id) { |
+ Send(new MediaSessionHostMsg_Deactivate(routing_id(), session_id, |
+ deactivation_id)); |
mlamouri (slow - plz ping)
2015/12/02 15:53:31
again
davve
2015/12/04 12:43:09
Done.
|
+} |
+ |
+void RendererMediaSessionManager::OnDidActivate(int session_id, |
+ int activation_id, |
mlamouri (slow - plz ping)
2015/12/02 15:53:31
a gain
davve
2015/12/04 12:43:09
Done.
|
+ bool success) { |
+ std::map<int, WebMediaSessionAndroid*>::iterator iter = |
+ sessions_.find(session_id); |
+ |
+ if (iter != sessions_.end()) |
mlamouri (slow - plz ping)
2015/12/02 15:53:31
nit: I would do:
```
if (iter == sessions_.end())
davve
2015/12/04 12:43:09
Done.
|
+ iter->second->OnDidActivate(activation_id, success); |
+} |
+ |
+void RendererMediaSessionManager::OnDidDeactivate(int session_id, |
+ int deactivation_id) { |
mlamouri (slow - plz ping)
2015/12/02 15:53:31
same here
davve
2015/12/04 12:43:09
Done.
|
+ std::map<int, WebMediaSessionAndroid*>::iterator iter = |
+ sessions_.find(session_id); |
+ |
+ if (iter != sessions_.end()) |
mlamouri (slow - plz ping)
2015/12/02 15:53:31
as above
davve
2015/12/04 12:43:09
Done.
|
+ iter->second->OnDidDeactivate(deactivation_id); |
+} |
+ |
} // namespace content |