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

Unified Diff: content/shell/renderer/shell_media_stream_client.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: content/shell/renderer/shell_media_stream_client.h
diff --git a/content/shell/renderer/shell_media_stream_client.h b/content/shell/renderer/shell_media_stream_client.h
index df74532ac6f7f87d8cd7dd22da0ca3b82096d31e..daa9004601e749f9e0761b3e6ae2655084a9857d 100644
--- a/content/shell/renderer/shell_media_stream_client.h
+++ b/content/shell/renderer/shell_media_stream_client.h
@@ -6,26 +6,26 @@
#define CONTENT_SHELL_RENDERER_SHELL_MEDIA_STREAM_CLIENT_H_
#include "base/callback_forward.h"
+#include "content/renderer/media/media_stream_client.h"
#include "third_party/WebKit/public/platform/WebURL.h"
-#include "webkit/renderer/media/media_stream_client.h"
namespace content {
// ShellMediaStreamClient is a mock implementation of
// webkit_media::MediaStreamClient used when running layout tests.
-class ShellMediaStreamClient : public webkit_media::MediaStreamClient {
+class ShellMediaStreamClient : public MediaStreamClient {
public:
ShellMediaStreamClient();
virtual ~ShellMediaStreamClient();
- // webkit_media::MediaStreamClient implementation.
+ // MediaStreamClient implementation.
virtual bool IsMediaStream(const GURL& url) OVERRIDE;
- virtual scoped_refptr<webkit_media::VideoFrameProvider> GetVideoFrameProvider(
+ virtual scoped_refptr<VideoFrameProvider> GetVideoFrameProvider(
const GURL& url,
const base::Closure& error_cb,
- const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE;
- virtual scoped_refptr<webkit_media::MediaStreamAudioRenderer>
- GetAudioRenderer(const GURL& url) OVERRIDE;
+ const VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE;
+ virtual scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer(
+ const GURL& url) OVERRIDE;
};
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698