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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/prerender/prerender_webmediaplayer.cc

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« chrome/renderer/prerender/DEPS ('K') | « chrome/renderer/prerender/prerender_webmediaplayer.h ('k') | content/content_renderer.gypi » ('j') | content/shell/renderer/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/prerender/prerender_webmediaplayer.cc
diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.cc b/chrome/renderer/prerender/prerender_webmediaplayer.cc
index dd7be9a3a74aacd70d6f7e276c63b8c578969e4b..8e470fe8ebfbdcc20e52ad570c8aef8e1027e74a 100644
--- a/chrome/renderer/prerender/prerender_webmediaplayer.cc
+++ b/chrome/renderer/prerender/prerender_webmediaplayer.cc
@@ -8,7 +8,6 @@
#include "content/public/renderer/render_view.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/web/WebMediaSource.h"
-#include "webkit/renderer/media/webmediaplayer_delegate.h"
namespace prerender {
@@ -16,8 +15,8 @@ PrerenderWebMediaPlayer::PrerenderWebMediaPlayer(
content::RenderView* render_view,
WebKit::WebFrame* frame,
WebKit::WebMediaPlayerClient* client,
- base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
- const webkit_media::WebMediaPlayerParams& params)
+ base::WeakPtr<content::WebMediaPlayerDelegate> delegate,
+ const content::WebMediaPlayerParams& params)
: RenderViewObserver(render_view),
WebMediaPlayerImpl(frame, client, delegate, params),
is_prerendering_(true),
« chrome/renderer/prerender/DEPS ('K') | « chrome/renderer/prerender/prerender_webmediaplayer.h ('k') | content/content_renderer.gypi » ('j') | content/shell/renderer/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698