| Index: content/browser/media/android/browser_media_player_manager.h
|
| diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
|
| index 9ec5e77fc135bd6546190e248be4f23f25a694ea..cb0ce381f8669f7a5f9ae75be661872f9672745f 100644
|
| --- a/content/browser/media/android/browser_media_player_manager.h
|
| +++ b/content/browser/media/android/browser_media_player_manager.h
|
| @@ -32,7 +32,6 @@ namespace content {
|
| class BrowserDemuxerAndroid;
|
| class ContentViewCoreImpl;
|
| class ExternalVideoSurfaceContainer;
|
| -class MediaPlayersObserver;
|
| class RenderFrameHost;
|
| class WebContents;
|
|
|
| @@ -46,8 +45,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
|
| public MediaSessionObserver {
|
| public:
|
| // Permits embedders to provide an extended version of the class.
|
| - typedef BrowserMediaPlayerManager* (*Factory)(RenderFrameHost*,
|
| - MediaPlayersObserver*);
|
| + typedef BrowserMediaPlayerManager* (*Factory)(RenderFrameHost*);
|
| static void RegisterFactory(Factory factory);
|
|
|
| // Permits embedders to handle custom urls.
|
| @@ -62,9 +60,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
|
| int player_id);
|
|
|
| // Returns a new instance using the registered factory if available.
|
| - static BrowserMediaPlayerManager* Create(
|
| - RenderFrameHost* rfh,
|
| - MediaPlayersObserver* audio_monitor);
|
| + static BrowserMediaPlayerManager* Create(RenderFrameHost* rfh);
|
|
|
| ContentViewCore* GetContentViewCore() const;
|
|
|
| @@ -97,8 +93,6 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
|
| const base::TimeDelta& current_time) override;
|
| void OnError(int player_id, int error) override;
|
| void OnVideoSizeChanged(int player_id, int width, int height) override;
|
| - void OnAudibleStateChanged(
|
| - int player_id, bool is_audible_now) override;
|
| void OnWaitingForDecryptionKey(int player_id) override;
|
|
|
| media::MediaResourceGetter* GetMediaResourceGetter() override;
|
| @@ -137,8 +131,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
|
|
|
| protected:
|
| // Clients must use Create() or subclass constructor.
|
| - BrowserMediaPlayerManager(RenderFrameHost* render_frame_host,
|
| - MediaPlayersObserver* audio_monitor);
|
| + explicit BrowserMediaPlayerManager(RenderFrameHost* render_frame_host);
|
|
|
| WebContents* web_contents() const { return web_contents_; }
|
|
|
| @@ -187,8 +180,6 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
|
|
|
| RenderFrameHost* const render_frame_host_;
|
|
|
| - MediaPlayersObserver* audio_monitor_;
|
| -
|
| // An array of managed players.
|
| ScopedVector<media::MediaPlayerAndroid> players_;
|
|
|
|
|