Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1505)

Unified Diff: content/renderer/render_view_impl.cc

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: trim things down Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index b19a1cb871adfd0f61acf0597fa34ca05c1ac47c..0b709da09b5fb75b666e990a0b2167d236761286 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2926,15 +2926,12 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
webkit_media::WebMediaPlayerParams params(
RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
- sink, gpu_factories, new RenderMediaLog());
- WebMediaPlayer* media_player =
- GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
- this, frame, client, AsWeakPtr(), params);
- if (!media_player) {
- media_player = new webkit_media::WebMediaPlayerImpl(
- frame, client, AsWeakPtr(), params);
- }
- return media_player;
+ GetContentClient()->renderer()->OverrideCreateMediaLoadDelegate(this),
+ sink,
+ gpu_factories,
+ new RenderMediaLog());
+ return new webkit_media::WebMediaPlayerImpl(
+ frame, client, AsWeakPtr(), params);
}
WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(

Powered by Google App Engine
This is Rietveld 408576698