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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: delegates 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: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index f1e19dc4cd8d6a8ad5541f963b01c2738aba108d..565bf309671ea7f627028a93f6e26cdda8be0b66 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -463,13 +463,9 @@ WebPlugin* ChromeContentRendererClient::CreatePluginReplacement(
return placeholder->plugin();
}
-webkit_media::WebMediaPlayerImpl*
-ChromeContentRendererClient::OverrideCreateWebMediaPlayer(
- content::RenderView* render_view,
- WebKit::WebFrame* frame,
- WebKit::WebMediaPlayerClient* client,
- base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
- const webkit_media::WebMediaPlayerParams& params) {
+content::MediaPlayerLoadDelegate*
+ChromeContentRendererClient::OverrideCreateMediaPlayerLoadDelegate(
+ content::RenderView* render_view) {
#if defined(OS_ANDROID)
// Chromium for Android doesn't support prerender yet.
return NULL;
@@ -477,8 +473,7 @@ ChromeContentRendererClient::OverrideCreateWebMediaPlayer(
if (!prerender::PrerenderHelper::IsPrerendering(render_view))
return NULL;
- return new prerender::PrerenderWebMediaPlayer(
- render_view, frame, client, delegate, params);
+ return new prerender::PrerenderWebMediaPlayer(render_view);
#endif
}

Powered by Google App Engine
This is Rietveld 408576698