Chromium Code Reviews| 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 aecd2bb607250083847bedefc8a3c134270ce7eb..9a3fe0b55cc27164d155a7df98dc6d2ec88ca74c 100644 |
| --- a/content/browser/media/android/browser_media_player_manager.cc |
| +++ b/content/browser/media/android/browser_media_player_manager.cc |
| @@ -7,8 +7,7 @@ |
| #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/browser_demuxer_android.h" |
|
Ted C
2015/08/27 23:58:44
indented too much
|
| #include "content/browser/media/android/media_resource_getter_impl.h" |
| #include "content/browser/media/android/media_session.h" |
| #include "content/browser/media/media_web_contents_observer.h" |
| @@ -121,11 +120,10 @@ void BrowserMediaPlayerManager::SetSurfacePeer( |
| // 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); |
| } |
| ContentViewCore* BrowserMediaPlayerManager::GetContentViewCore() const { |
| @@ -194,10 +192,8 @@ MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer( |
| } |
| 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)), |
| @@ -337,12 +333,6 @@ void BrowserMediaPlayerManager::OnVideoSizeChanged( |
| video_view_->OnVideoSizeChanged(width, height); |
| } |
| -void BrowserMediaPlayerManager::OnAudibleStateChanged( |
| - int player_id, bool is_audible) { |
| - audio_monitor_->OnAudibleStateChanged( |
| - render_frame_host_, player_id, is_audible); |
| -} |
| - |
| void BrowserMediaPlayerManager::OnWaitingForDecryptionKey(int player_id) { |
| Send(new MediaPlayerMsg_WaitingForDecryptionKey(RoutingID(), player_id)); |
| } |
| @@ -623,7 +613,6 @@ void BrowserMediaPlayerManager::RemovePlayer(int player_id) { |
| ReleaseMediaResources(player_id); |
| (*it)->DeleteOnCorrectThread(); |
| players_.weak_erase(it); |
| - audio_monitor_->RemovePlayer(render_frame_host_, player_id); |
| MediaSession::Get(web_contents())->RemovePlayer(this, player_id); |
| break; |
| } |