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

Unified Diff: content/renderer/media/media_stream_center.cc

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
Index: content/renderer/media/media_stream_center.cc
diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc
index c3ae47a3124e68f63f2233a19cde2f9758101c5c..4a34a4601bb9aecb0f8efa1820937b1efed84234 100644
--- a/content/renderer/media/media_stream_center.cc
+++ b/content/renderer/media/media_stream_center.cc
@@ -28,19 +28,19 @@
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/libjingle/source/talk/app/webrtc/jsep.h"
-using WebKit::WebFrame;
-using WebKit::WebView;
+using blink::WebFrame;
+using blink::WebView;
namespace content {
-MediaStreamCenter::MediaStreamCenter(WebKit::WebMediaStreamCenterClient* client,
+MediaStreamCenter::MediaStreamCenter(blink::WebMediaStreamCenterClient* client,
MediaStreamDependencyFactory* factory)
: rtc_factory_(factory), next_request_id_(0) {}
MediaStreamCenter::~MediaStreamCenter() {}
bool MediaStreamCenter::getMediaStreamTrackSources(
- const WebKit::WebMediaStreamTrackSourcesRequest& request) {
+ const blink::WebMediaStreamTrackSourcesRequest& request) {
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableDeviceEnumeration)) {
int request_id = next_request_id_++;
@@ -53,8 +53,8 @@ bool MediaStreamCenter::getMediaStreamTrackSources(
}
void MediaStreamCenter::didEnableMediaStreamTrack(
- const WebKit::WebMediaStream& stream,
- const WebKit::WebMediaStreamTrack& component) {
+ const blink::WebMediaStream& stream,
+ const blink::WebMediaStreamTrack& component) {
webrtc::MediaStreamTrackInterface* track =
MediaStreamDependencyFactory::GetNativeMediaStreamTrack(component);
if (track)
@@ -62,8 +62,8 @@ void MediaStreamCenter::didEnableMediaStreamTrack(
}
void MediaStreamCenter::didDisableMediaStreamTrack(
- const WebKit::WebMediaStream& stream,
- const WebKit::WebMediaStreamTrack& component) {
+ const blink::WebMediaStream& stream,
+ const blink::WebMediaStreamTrack& component) {
webrtc::MediaStreamTrackInterface* track =
MediaStreamDependencyFactory::GetNativeMediaStreamTrack(component);
if (track)
@@ -71,9 +71,9 @@ void MediaStreamCenter::didDisableMediaStreamTrack(
}
bool MediaStreamCenter::didStopMediaStreamTrack(
- const WebKit::WebMediaStreamTrack& web_track) {
+ const blink::WebMediaStreamTrack& web_track) {
DVLOG(1) << "MediaStreamCenter::didStopMediaStreamTrack";
- WebKit::WebMediaStreamSource web_source = web_track.source();
+ blink::WebMediaStreamSource web_source = web_track.source();
MediaStreamSourceExtraData* extra_data =
static_cast<MediaStreamSourceExtraData*>(web_source.extraData());
if (!extra_data) {
@@ -86,7 +86,7 @@ bool MediaStreamCenter::didStopMediaStreamTrack(
}
void MediaStreamCenter::didStopLocalMediaStream(
- const WebKit::WebMediaStream& stream) {
+ const blink::WebMediaStream& stream) {
DVLOG(1) << "MediaStreamCenter::didStopLocalMediaStream";
MediaStreamExtraData* extra_data =
static_cast<MediaStreamExtraData*>(stream.extraData());
@@ -101,12 +101,12 @@ void MediaStreamCenter::didStopLocalMediaStream(
// MediaStreamTrack by disabling it if the same device is used as source by
// multiple tracks. Note that disabling a track here, don't affect the
// enabled property in JS.
- WebKit::WebVector<WebKit::WebMediaStreamTrack> audio_tracks;
+ blink::WebVector<blink::WebMediaStreamTrack> audio_tracks;
stream.audioTracks(audio_tracks);
for (size_t i = 0; i < audio_tracks.size(); ++i)
didDisableMediaStreamTrack(stream, audio_tracks[i]);
- WebKit::WebVector<WebKit::WebMediaStreamTrack> video_tracks;
+ blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
stream.videoTracks(video_tracks);
for (size_t i = 0; i < video_tracks.size(); ++i)
didDisableMediaStreamTrack(stream, video_tracks[i]);
@@ -115,15 +115,15 @@ void MediaStreamCenter::didStopLocalMediaStream(
}
void MediaStreamCenter::didCreateMediaStream(
- WebKit::WebMediaStream& stream) {
+ blink::WebMediaStream& stream) {
if (!rtc_factory_)
return;
rtc_factory_->CreateNativeLocalMediaStream(&stream);
}
bool MediaStreamCenter::didAddMediaStreamTrack(
- const WebKit::WebMediaStream& stream,
- const WebKit::WebMediaStreamTrack& track) {
+ const blink::WebMediaStream& stream,
+ const blink::WebMediaStreamTrack& track) {
if (!rtc_factory_)
return false;
@@ -131,8 +131,8 @@ bool MediaStreamCenter::didAddMediaStreamTrack(
}
bool MediaStreamCenter::didRemoveMediaStreamTrack(
- const WebKit::WebMediaStream& stream,
- const WebKit::WebMediaStreamTrack& track) {
+ const blink::WebMediaStream& stream,
+ const blink::WebMediaStreamTrack& track) {
if (!rtc_factory_)
return false;
@@ -155,29 +155,29 @@ void MediaStreamCenter::OnGetSourcesComplete(
RequestMap::iterator request_it = requests_.find(request_id);
DCHECK(request_it != requests_.end());
- WebKit::WebVector<WebKit::WebSourceInfo> sourceInfos(devices.size());
+ blink::WebVector<blink::WebSourceInfo> sourceInfos(devices.size());
for (size_t i = 0; i < devices.size(); ++i) {
const MediaStreamDevice& device = devices[i].device;
DCHECK(device.type == MEDIA_DEVICE_AUDIO_CAPTURE ||
device.type == MEDIA_DEVICE_VIDEO_CAPTURE);
- WebKit::WebSourceInfo::VideoFacingMode video_facing;
+ blink::WebSourceInfo::VideoFacingMode video_facing;
switch (device.video_facing) {
case MEDIA_VIDEO_FACING_USER:
- video_facing = WebKit::WebSourceInfo::VideoFacingModeUser;
+ video_facing = blink::WebSourceInfo::VideoFacingModeUser;
break;
case MEDIA_VIDEO_FACING_ENVIRONMENT:
- video_facing = WebKit::WebSourceInfo::VideoFacingModeEnvironment;
+ video_facing = blink::WebSourceInfo::VideoFacingModeEnvironment;
break;
default:
- video_facing = WebKit::WebSourceInfo::VideoFacingModeNone;
+ video_facing = blink::WebSourceInfo::VideoFacingModeNone;
}
sourceInfos[i]
- .initialize(WebKit::WebString::fromUTF8(device.id),
+ .initialize(blink::WebString::fromUTF8(device.id),
device.type == MEDIA_DEVICE_AUDIO_CAPTURE
- ? WebKit::WebSourceInfo::SourceKindAudio
- : WebKit::WebSourceInfo::SourceKindVideo,
- WebKit::WebString::fromUTF8(device.name),
+ ? blink::WebSourceInfo::SourceKindAudio
+ : blink::WebSourceInfo::SourceKindVideo,
+ blink::WebString::fromUTF8(device.name),
video_facing);
}
request_it->second.requestSucceeded(sourceInfos);
« no previous file with comments | « content/renderer/media/media_stream_center.h ('k') | content/renderer/media/media_stream_dependency_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698