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

Unified Diff: webkit/tools/test_shell/test_webview_delegate.cc

Issue 8570010: Moving media-related files from webkit/glue/ to webkit/media/. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: minor fixes Created 9 years, 1 month 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
« no previous file with comments | « webkit/tools/test_shell/test_shell.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_webview_delegate.cc
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 9231d1d15205c7e5bb7ee4d120bbc2c38a875c54..d1dea82052d45ec6ffcef9130497ca4f19a18e48 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -60,12 +60,12 @@
#include "ui/gfx/point.h"
#include "webkit/appcache/web_application_cache_host_impl.h"
#include "webkit/glue/glue_serialize.h"
-#include "webkit/glue/media/video_renderer_impl.h"
#include "webkit/glue/webdropdata.h"
#include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webmediaplayer_impl.h"
#include "webkit/glue/webpreferences.h"
#include "webkit/glue/window_open_disposition.h"
+#include "webkit/media/video_renderer_impl.h"
+#include "webkit/media/webmediaplayer_impl.h"
#include "webkit/plugins/npapi/webplugin_impl.h"
#include "webkit/plugins/npapi/plugin_list.h"
#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
@@ -647,14 +647,14 @@ WebMediaPlayer* TestWebViewDelegate::createMediaPlayer(
scoped_ptr<media::FilterCollection> collection(
new media::FilterCollection());
- scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer(
- new webkit_glue::VideoRendererImpl(false));
+ scoped_refptr<webkit_media::VideoRendererImpl> video_renderer(
+ new webkit_media::VideoRendererImpl(false));
collection->AddVideoRenderer(video_renderer);
- scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
- new webkit_glue::WebMediaPlayerImpl(
+ scoped_ptr<webkit_media::WebMediaPlayerImpl> result(
+ new webkit_media::WebMediaPlayerImpl(
client,
- base::WeakPtr<webkit_glue::WebMediaPlayerDelegate>(),
+ base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
collection.release(),
message_loop_factory.release(),
NULL,
« no previous file with comments | « webkit/tools/test_shell/test_shell.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698