Index: content/browser/media/media_web_contents_observer.cc |
diff --git a/content/browser/media/media_web_contents_observer.cc b/content/browser/media/media_web_contents_observer.cc |
index c17a9ff23c32cc3674a1ce1bc44609e58ec7c75f..4845b3a44dc4374a4a5ed442aa3e44ffeb930028 100644 |
--- a/content/browser/media/media_web_contents_observer.cc |
+++ b/content/browser/media/media_web_contents_observer.cc |
@@ -14,7 +14,9 @@ |
#if defined(OS_ANDROID) |
#include "content/browser/media/android/browser_media_player_manager.h" |
+#include "content/browser/media/android/browser_media_session_manager.h" |
#include "content/common/media/media_player_messages_android.h" |
+#include "content/common/media/media_session_messages_android.h" |
#include "media/base/android/media_player_android.h" |
#endif // defined(OS_ANDROID) |
@@ -36,6 +38,7 @@ void MediaWebContentsObserver::RenderFrameDeleted( |
// Always destroy the media players before CDMs because we do not support |
// detaching CDMs from media players yet. See http://crbug.com/330324 |
media_player_managers_.erase(key); |
+ media_session_managers_.erase(key); |
#endif |
// TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager |
// and BrowserCdmManager all run on browser UI thread. So this call is okay. |
@@ -106,6 +109,12 @@ bool MediaWebContentsObserver::OnMediaPlayerMessageReceived( |
GetMediaPlayerManager(render_frame_host), |
BrowserMediaPlayerManager::OnNotifyExternalSurface) |
#endif // defined(VIDEO_HOLE) |
+ IPC_MESSAGE_FORWARD(MediaSessionHostMsg_Activate, |
+ GetMediaSessionManager(render_frame_host), |
+ BrowserMediaSessionManager::OnActivate) |
+ IPC_MESSAGE_FORWARD(MediaSessionHostMsg_Deactivate, |
+ GetMediaSessionManager(render_frame_host), |
+ BrowserMediaSessionManager::OnDeactivate) |
IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP() |
return handled; |
@@ -164,6 +173,17 @@ BrowserMediaPlayerManager* MediaWebContentsObserver::GetMediaPlayerManager( |
return media_player_managers_.get(key); |
} |
+BrowserMediaSessionManager* MediaWebContentsObserver::GetMediaSessionManager( |
+ RenderFrameHost* render_frame_host) { |
+ uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host); |
+ if (!media_session_managers_.contains(key)) { |
+ media_session_managers_.set( |
+ key, |
+ make_scoped_ptr(new BrowserMediaSessionManager(render_frame_host))); |
+ } |
+ return media_session_managers_.get(key); |
+} |
+ |
#if defined(VIDEO_HOLE) |
void MediaWebContentsObserver::OnFrameInfoUpdated() { |
for (MediaPlayerManagerMap::iterator iter = media_player_managers_.begin(); |