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

Unified Diff: content/browser/media/media_web_contents_observer.h

Issue 1441883003: Hook up RendererMediaSessionManager with browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comment from philipj: ActiveDOMObject 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/browser/media/media_web_contents_observer.h
diff --git a/content/browser/media/media_web_contents_observer.h b/content/browser/media/media_web_contents_observer.h
index 382dcdf772f63b00749b65918d4d87bcd3098028..ac32ca0f62d335ff47b8e0c35f27ee3cb8836f47 100644
--- a/content/browser/media/media_web_contents_observer.h
+++ b/content/browser/media/media_web_contents_observer.h
@@ -14,6 +14,7 @@ namespace content {
class BrowserCdmManager;
class BrowserMediaPlayerManager;
+class BrowserMediaSessionManager;
// This class manages all RenderFrame based media related managers at the
// browser side. It receives IPC messages from media RenderFrameObservers and
@@ -43,6 +44,9 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {
BrowserMediaPlayerManager* GetMediaPlayerManager(
RenderFrameHost* render_frame_host);
+ BrowserMediaSessionManager* GetMediaSessionManager(
+ RenderFrameHost* render_frame_host);
+
void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);
#if defined(VIDEO_HOLE)
@@ -55,6 +59,12 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {
scoped_ptr<BrowserMediaPlayerManager>>
MediaPlayerManagerMap;
MediaPlayerManagerMap media_player_managers_;
+
+ // Map from RenderFrameHost* to BrowserMediaSessionManager.
+ typedef base::ScopedPtrHashMap<uintptr_t,
+ scoped_ptr<BrowserMediaSessionManager>>
+ MediaSessionManagerMap;
+ MediaSessionManagerMap media_session_managers_;
#endif // defined(OS_ANDROID)
private:

Powered by Google App Engine
This is Rietveld 408576698