From 9d2cd33e9d1be6b1ff0a31f2b6a15e605c39ba3b Mon Sep 17 00:00:00 2001 From: "scherkus@chromium.org" Date: Fri, 30 Aug 2013 06:40:16 +0000 Subject: Migrate media::MediaPlayerManager::Create() to content::BrowserMediaPlayerManager. This fixes a layering violation where content::RenderViewHost was forward declared in media code. It also lets content code use BrowserMediaPlayerManager directly without resorting to casting. BUG=263652 Review URL: https://chromiumcodereview.appspot.com/23735002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220520 0039d316-1c4b-4281-b951-d872f2087c98 --- media/base/android/media_player_manager.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'media') diff --git a/media/base/android/media_player_manager.h b/media/base/android/media_player_manager.h index a0f5017..46ea8ca 100644 --- a/media/base/android/media_player_manager.h +++ b/media/base/android/media_player_manager.h @@ -14,10 +14,6 @@ #include "media/base/media_export.h" #include "media/base/media_keys.h" -namespace content { -class RenderViewHost; -} - namespace media { class MediaDrmBridge; @@ -25,25 +21,8 @@ class MediaPlayerAndroid; class MediaResourceGetter; // This class is responsible for managing active MediaPlayerAndroid objects. -// Objects implementing this interface a created via -// MediaPlayerManager::Create(), allowing embedders to provide their -// implementation. class MEDIA_EXPORT MediaPlayerManager { public: - // The type of the factory function that returns a new instance of the - // MediaPlayerManager implementation. - typedef MediaPlayerManager* (*FactoryFunction)(content::RenderViewHost*); - - // Allows to override the default factory function in order to provide - // a custom implementation to the RenderViewHost instance. - // Must be called from the main thread. - static void RegisterFactoryFunction(FactoryFunction factory_function); - - // Returns a new instance of MediaPlayerManager interface implementation. - // The returned object is owned by the caller. Must be called on the main - // thread. - static MediaPlayerManager* Create(content::RenderViewHost* render_view_host); - virtual ~MediaPlayerManager() {} // Called by a MediaPlayerAndroid object when it is going to decode -- cgit v1.1