Propagate audible state from player to the containing tab

content/browser/media/media_web_contents_observer.cc

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 cc90b55ec02b7c582ccf883eb5c942b345369683..c99ecca69fd65c8d29ea0cb3976e73480bf8061e 100644
--- a/content/browser/media/media_web_contents_observer.cc
+++ b/content/browser/media/media_web_contents_observer.cc
@@ -13,6 +13,7 @@
 #include "ipc/ipc_message_macros.h"
 
 #if defined(OS_ANDROID)
+#include "content/browser/android/audio_monitor_android.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "media/base/android/media_player_android.h"
@@ -22,7 +23,8 @@ namespace content {
 
 MediaWebContentsObserver::MediaWebContentsObserver(
     WebContents* web_contents)
-    : WebContentsObserver(web_contents) {
+    : WebContentsObserver(web_contents),
+      audio_monitor_(new AudioMonitorAndroid(web_contents)) {

[Ted C, 2015/02/07 00:07:15]

needs to be ifdef'd to android

[Tima Vaisburd, 2015/02/07 03:00:23]

Done.

 }
 
 MediaWebContentsObserver::~MediaWebContentsObserver() {
@@ -35,6 +37,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);
+  audio_monitor_->RenderFrameDeleted(render_frame_host);
 #endif
   // TODO(xhwang): Currently MediaWebContentsObserver, BrowserMediaPlayerManager
   // and BrowserCdmManager all run on browser UI thread. So this call is okay.
@@ -47,6 +50,14 @@ void MediaWebContentsObserver::RenderFrameDeleted(
     browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID());
 }
 
+bool MediaWebContentsObserver::IsAudible() const {

[Ted C, 2015/02/07 00:07:15]

why not make this method only applicable on android?

[Tima Vaisburd, 2015/02/07 03:00:23]

Done.

+#if defined(OS_ANDROID)
+  return audio_monitor_->is_audible();
+#else
+  return false; // unable to answer
+#endif   // defined(OS_ANDROID)
+}
+
 #if defined(OS_ANDROID)
 
 bool MediaWebContentsObserver::OnMessageReceived(
@@ -161,7 +172,8 @@ BrowserMediaPlayerManager* MediaWebContentsObserver::GetMediaPlayerManager(
   if (!media_player_managers_.contains(key)) {
     media_player_managers_.set(
         key,
-        make_scoped_ptr(BrowserMediaPlayerManager::Create(render_frame_host)));
+        make_scoped_ptr(BrowserMediaPlayerManager::Create(
+            render_frame_host, audio_monitor_.get())));
   }
   return media_player_managers_.get(key);
 }