| Index: content/browser/media/android/browser_media_player_manager.cc
|
| diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
|
| index 8600a754ef3332910773cb92edb03aff60f4aa06..5fecd39836ab9172aad7e9fcba7fa54af2c98030 100644
|
| --- a/content/browser/media/android/browser_media_player_manager.cc
|
| +++ b/content/browser/media/android/browser_media_player_manager.cc
|
| @@ -7,7 +7,6 @@
|
| #include "base/android/scoped_java_ref.h"
|
| #include "base/command_line.h"
|
| #include "content/browser/android/content_view_core_impl.h"
|
| -#include "content/browser/android/media_players_observer.h"
|
| #include "content/browser/media/android/browser_demuxer_android.h"
|
| #include "content/browser/media/android/media_resource_getter_impl.h"
|
| #include "content/browser/renderer_host/render_view_host_impl.h"
|
| @@ -58,11 +57,10 @@
|
|
|
| // static
|
| BrowserMediaPlayerManager* BrowserMediaPlayerManager::Create(
|
| - RenderFrameHost* rfh,
|
| - MediaPlayersObserver* audio_monitor) {
|
| + RenderFrameHost* rfh) {
|
| if (g_factory)
|
| - return g_factory(rfh, audio_monitor);
|
| - return new BrowserMediaPlayerManager(rfh, audio_monitor);
|
| + return g_factory(rfh);
|
| + return new BrowserMediaPlayerManager(rfh);
|
| }
|
|
|
| ContentViewCoreImpl* BrowserMediaPlayerManager::GetContentViewCore() const {
|
| @@ -123,10 +121,8 @@
|
| }
|
|
|
| BrowserMediaPlayerManager::BrowserMediaPlayerManager(
|
| - RenderFrameHost* render_frame_host,
|
| - MediaPlayersObserver* audio_monitor)
|
| + RenderFrameHost* render_frame_host)
|
| : render_frame_host_(render_frame_host),
|
| - audio_monitor_(audio_monitor),
|
| fullscreen_player_id_(kInvalidMediaPlayerId),
|
| fullscreen_player_is_released_(false),
|
| web_contents_(WebContents::FromRenderFrameHost(render_frame_host)),
|
| @@ -256,12 +252,6 @@
|
| width, height));
|
| if (fullscreen_player_id_ == player_id)
|
| video_view_->OnVideoSizeChanged(width, height);
|
| -}
|
| -
|
| -void BrowserMediaPlayerManager::OnAudibleStateChanged(
|
| - int player_id, bool is_audible) {
|
| - audio_monitor_->OnAudibleStateChanged(
|
| - render_frame_host_, player_id, is_audible);
|
| }
|
|
|
| media::MediaResourceGetter*
|
| @@ -528,7 +518,6 @@
|
| if ((*it)->player_id() == player_id) {
|
| ReleaseMediaResources(player_id);
|
| players_.erase(it);
|
| - audio_monitor_->RemovePlayer(render_frame_host_, player_id);
|
| break;
|
| }
|
| }
|
|
|