content/browser/media/media_web_contents_observer.h - Issue 975943003: Revert of Revert of Propagate audible state from player to the containing tab"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 975943003: Revert of Revert of Propagate audible state from player to the containing tab" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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

« content/browser/android/media_players_observer.cc ('K') | « content/browser/media/audio_stream_monitor_unittest.cc ('k') | content/browser/media/media_web_contents_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 3b451a82800068360fdaad1fb9ca414903c523d2..2eb08c109243d3ce0c4f5d304f49dfc414e2f283 100644

--- a/content/browser/media/media_web_contents_observer.h

+++ b/content/browser/media/media_web_contents_observer.h

@@ -7,11 +7,16 @@

#include "base/compiler_specific.h"

#include "base/containers/scoped_ptr_hash_map.h"

+#include "base/memory/scoped_ptr.h"

#include "content/common/content_export.h"

#include "content/public/browser/web_contents_observer.h"

namespace content {

+#if defined(OS_ANDROID)

+class MediaPlayersObserver;

+#endif // defined(OS_ANDROID)

class BrowserCdmManager;

class BrowserMediaPlayerManager;

@@ -45,6 +50,8 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {

void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);

+ MediaPlayersObserver* GetMediaPlayersObserver() const;

#if defined(VIDEO_HOLE)

void OnFrameInfoUpdated();

#endif // defined(VIDEO_HOLE)