diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 03:21:55 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 03:21:55 +0000 |
| commit | 25fb9b3176443b046976524409e9b9f9ff28d2af (patch) | |
| tree | af5e054b2addda36cc0a046497bb7cbbfdaca00f /content/renderer | |
| parent | 99022043653dd8c1e9bf6a57561c0310a216f089 (diff) | |
| download | chromium_src-25fb9b3176443b046976524409e9b9f9ff28d2af.zip chromium_src-25fb9b3176443b046976524409e9b9f9ff28d2af.tar.gz chromium_src-25fb9b3176443b046976524409e9b9f9ff28d2af.tar.bz2 | |
Adding android implementation for CreateMediaPlayer()
WebMediaPlayerAndroid has been upstreamed in http://codereview.chromium.org/10073016/
This change bring the creation of that class into render_view_impl.cc
BUG=
TEST=
Review URL: http://codereview.chromium.org/10246005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 3e9c415..a3696bd 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -178,7 +178,9 @@ #include "webkit/plugins/npapi/webplugin_impl.h" #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" -#if defined(OS_WIN) +#if defined(OS_ANDROID) +#include "webkit/media/android/webmediaplayer_android.h" +#elif defined(OS_WIN) // TODO(port): these files are currently Windows only because they concern: // * theming #include "ui/gfx/native_theme_win.h" @@ -2165,6 +2167,11 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer( FOR_EACH_OBSERVER( RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); +#if defined(OS_ANDROID) + return new webkit_media::WebMediaPlayerAndroid( + client, cookieJar(frame)); +#endif + media::MessageLoopFactory* message_loop_factory = new media::MessageLoopFactory(); media::FilterCollection* collection = new media::FilterCollection(); @@ -2217,16 +2224,11 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer( content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( this, frame, client, AsWeakPtr(), collection, audio_source_provider, message_loop_factory, media_stream_impl_, render_media_log); -#if defined(OS_ANDROID) - // TODO(qinmin): Implement for android. - // http://crbug.com/113218 -#else if (!media_player) { media_player = new webkit_media::WebMediaPlayerImpl( frame, client, AsWeakPtr(), collection, audio_source_provider, message_loop_factory, media_stream_impl_, render_media_log); } -#endif return media_player; } |