Propagate audible state from player to the containing tab

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 2512 matching lines @@
 void WebContentsImpl::StopFinding(StopFindAction action) {
   Send(new ViewMsg_StopFinding(GetRoutingID(), action));
 }
 
 void WebContentsImpl::InsertCSS(const std::string& css) {
   GetMainFrame()->Send(new FrameMsg_CSSInsertRequest(
       GetMainFrame()->GetRoutingID(), css));
 }
 
 bool WebContentsImpl::WasRecentlyAudible() {
+#if defined(ENABLE_BROWSER_CDMS)

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

or if we don't want to make the method ifdef'd to android in the other file,
should we ifdef it to this instead?

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

Yes, I put it under
   #if defined(ENABLE_BROWSER_CDMS) && defined(OS_ANDROID)
I'm not sure whether OS_ANDROID implies ENABLE_BROWSER_CDMS

+  return media_web_contents_observer_->IsAudible();
+#else
   return audio_stream_monitor_.WasRecentlyAudible();
+#endif
 }
 
 void WebContentsImpl::GetManifest(const GetManifestCallback& callback) {
   manifest_manager_host_->GetManifest(GetMainFrame(), callback);
 }
 
 void WebContentsImpl::ExitFullscreen() {
   // Clean up related state and initiate the fullscreen exit.
   GetRenderViewHostImpl()->RejectMouseLockOrUnlockIfNecessary();
   ExitFullscreenMode();
@@ skipping 1998 matching lines @@
   node->render_manager()->ResumeResponseDeferredAtStart();
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content