diff options
| author | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 06:59:03 +0000 |
|---|---|---|
| committer | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 06:59:03 +0000 |
| commit | 9096c992a09f40feeeda4ba5a7001a1ccd034c3f (patch) | |
| tree | b2be27f4b50374e4bb0c46b41fb8e197441f1a8d /content/browser/android/media_player_manager_impl.h | |
| parent | 232005abbc32dfaf8498ef8ee9c15e4f30d1e7e7 (diff) | |
| download | chromium_src-9096c992a09f40feeeda4ba5a7001a1ccd034c3f.zip chromium_src-9096c992a09f40feeeda4ba5a7001a1ccd034c3f.tar.gz chromium_src-9096c992a09f40feeeda4ba5a7001a1ccd034c3f.tar.bz2 | |
[Android] Added ability to inject a custom implementation of MediaPlayerManager to RenderViewHostImpl.
Inlined MediaPlayerManager interface's virtual destructor to remove a single method .cc file.
Added a few missing methods to the interface.
Fixed includes in the files calling to these methods.
Refactoring, thus no new tests.
R=bulach@chromium.org, qinmin@chromium.org
TBR=scherkus@chromium.org
BUG=178307
Review URL: https://chromiumcodereview.appspot.com/15341003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android/media_player_manager_impl.h')
| -rw-r--r-- | content/browser/android/media_player_manager_impl.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/content/browser/android/media_player_manager_impl.h b/content/browser/android/media_player_manager_impl.h index 7c07679..61c1557 100644 --- a/content/browser/android/media_player_manager_impl.h +++ b/content/browser/android/media_player_manager_impl.h @@ -32,8 +32,6 @@ class MediaPlayerManagerImpl : public RenderViewHostObserver, public media::MediaPlayerManager { public: - // Create a MediaPlayerManagerImpl object for the |render_view_host|. - explicit MediaPlayerManagerImpl(RenderViewHost* render_view_host); virtual ~MediaPlayerManagerImpl(); // RenderViewHostObserver overrides. @@ -72,17 +70,22 @@ class MediaPlayerManagerImpl virtual void ReleaseMediaResources( media::MediaPlayerAndroid* player) OVERRIDE; virtual media::MediaResourceGetter* GetMediaResourceGetter() OVERRIDE; - - // Release all the players managed by this object. - void DestroyAllMediaPlayers(); + virtual media::MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE; + virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE; + virtual void DestroyAllMediaPlayers() OVERRIDE; #if defined(GOOGLE_TV) void AttachExternalVideoSurface(int player_id, jobject surface); void DetachExternalVideoSurface(int player_id); #endif - media::MediaPlayerAndroid* GetFullscreenPlayer(); - media::MediaPlayerAndroid* GetPlayer(int player_id); + protected: + friend MediaPlayerManager* MediaPlayerManager::Create( + content::RenderViewHost*); + + // The instance of this class is supposed to be created by either Create() + // method of MediaPlayerManager or the derived classes constructors. + explicit MediaPlayerManagerImpl(RenderViewHost* render_view_host); private: // Message handlers. |