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

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

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
Index: chrome/renderer/prerender/prerender_webmediaplayer.h
diff --git a/chrome/renderer/prerender/prerender_webmediaplayer.h b/chrome/renderer/prerender/prerender_webmediaplayer.h
index da0b4d39c66e62f9cd29532a93320dde6cab6887..ba60dcc4be99025ea83df3e592c4bf5fd99f1e38 100644
--- a/chrome/renderer/prerender/prerender_webmediaplayer.h
+++ b/chrome/renderer/prerender/prerender_webmediaplayer.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "content/public/renderer/render_view_observer.h"
-#include "webkit/renderer/media/webmediaplayer_impl.h"
+#include "content/renderer/media/webmediaplayer_impl.h"
namespace prerender {
@@ -16,14 +16,14 @@ namespace prerender {
// the loading of the media till the prerendered page is swapped in.
class PrerenderWebMediaPlayer
: public content::RenderViewObserver,
- public webkit_media::WebMediaPlayerImpl {
+ public content::WebMediaPlayerImpl {
public:
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);
virtual ~PrerenderWebMediaPlayer();
// WebMediaPlayerImpl methods:

Powered by Google App Engine
This is Rietveld 408576698