Chromium Code Reviews| 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..01c54d97f1e86d6899a84f16cdccde990b5b595c 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 AudioMonitorAndroid; |
| +#endif // defined(OS_ANDROID) |
| + |
| class BrowserCdmManager; |
| class BrowserMediaPlayerManager; |
| @@ -28,6 +33,10 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver { |
| void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; |
| #if defined(OS_ANDROID) |
| + // Returns true if at least one player is playing sound and false if |
| + // they are all silent. |
| + bool IsAudible() const; |
| + |
| bool OnMessageReceived(const IPC::Message& message, |
| RenderFrameHost* render_frame_host) override; |
| @@ -54,6 +63,8 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver { |
| typedef base::ScopedPtrHashMap<uintptr_t, BrowserMediaPlayerManager> |
| MediaPlayerManagerMap; |
| MediaPlayerManagerMap media_player_managers_; |
| + |
| + scoped_ptr<AudioMonitorAndroid> audio_monitor_; |
|
no sievers
2015/02/10 01:33:03
Can you put this before |media_player_managers_|,
Tima Vaisburd
2015/02/11 03:34:05
Done.
|
| #endif // defined(OS_ANDROID) |
| private: |