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

Unified Diff: content/renderer/media/media_stream_impl.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
Index: content/renderer/media/media_stream_impl.cc
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index cb3a5cb6c63e41df9c97974634bc4e66864e1eec..6b2fa62beb8c6820a750d4e7c8f947b7ac3d0551 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -10,6 +10,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
+#include "content/renderer/media/media_stream_audio_renderer.h"
#include "content/renderer/media/media_stream_dependency_factory.h"
#include "content/renderer/media/media_stream_dispatcher.h"
#include "content/renderer/media/media_stream_extra_data.h"
@@ -26,7 +27,6 @@
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
-#include "webkit/renderer/media/media_stream_audio_renderer.h"
namespace content {
namespace {
@@ -218,11 +218,11 @@ bool MediaStreamImpl::CheckMediaStream(const GURL& url) {
(!stream->GetVideoTracks().empty() || !stream->GetAudioTracks().empty()));
}
-scoped_refptr<webkit_media::VideoFrameProvider>
+scoped_refptr<VideoFrameProvider>
MediaStreamImpl::GetVideoFrameProvider(
const GURL& url,
const base::Closure& error_cb,
- const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) {
+ const VideoFrameProvider::RepaintCB& repaint_cb) {
DCHECK(CalledOnValidThread());
WebKit::WebMediaStream descriptor(GetMediaStream(url));
@@ -239,7 +239,7 @@ MediaStreamImpl::GetVideoFrameProvider(
return NULL;
}
-scoped_refptr<webkit_media::MediaStreamAudioRenderer>
+scoped_refptr<MediaStreamAudioRenderer>
MediaStreamImpl::GetAudioRenderer(const GURL& url) {
DCHECK(CalledOnValidThread());
WebKit::WebMediaStream descriptor(GetMediaStream(url));
@@ -507,11 +507,11 @@ void MediaStreamImpl::FrameWillClose(WebKit::WebFrame* frame) {
}
}
-scoped_refptr<webkit_media::VideoFrameProvider>
+scoped_refptr<VideoFrameProvider>
MediaStreamImpl::CreateVideoFrameProvider(
webrtc::MediaStreamInterface* stream,
const base::Closure& error_cb,
- const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) {
+ const VideoFrameProvider::RepaintCB& repaint_cb) {
if (stream->GetVideoTracks().empty())
return NULL;

Powered by Google App Engine
This is Rietveld 408576698