diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 06:40:16 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-30 06:40:16 +0000 |
| commit | 9d2cd33e9d1be6b1ff0a31f2b6a15e605c39ba3b (patch) | |
| tree | bbab82f86944ec7ce856682f83a3bb849a8011ec /content/browser/android/child_process_launcher_android.cc | |
| parent | 40076a26f49d0494b2231fec5ec2ebb736fc9039 (diff) | |
| download | chromium_src-9d2cd33e9d1be6b1ff0a31f2b6a15e605c39ba3b.zip chromium_src-9d2cd33e9d1be6b1ff0a31f2b6a15e605c39ba3b.tar.gz chromium_src-9d2cd33e9d1be6b1ff0a31f2b6a15e605c39ba3b.tar.bz2 | |
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
Diffstat (limited to 'content/browser/android/child_process_launcher_android.cc')
| -rw-r--r-- | content/browser/android/child_process_launcher_android.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/android/child_process_launcher_android.cc b/content/browser/android/child_process_launcher_android.cc index d73e299..ad1a018 100644 --- a/content/browser/android/child_process_launcher_android.cc +++ b/content/browser/android/child_process_launcher_android.cc @@ -8,6 +8,7 @@ #include "base/android/jni_array.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "content/browser/android/browser_media_player_manager.h" #include "content/browser/renderer_host/compositor_impl_android.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/public/browser/browser_thread.h" @@ -15,7 +16,6 @@ #include "content/public/common/content_switches.h" #include "jni/ChildProcessLauncher_jni.h" #include "media/base/android/media_player_android.h" -#include "media/base/android/media_player_manager.h" #include "ui/gl/android/scoped_java_surface.h" using base::android::AttachCurrentThread; |