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

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

Issue 629953002: Remove obsolete path of getSources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 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
« no previous file with comments | « content/renderer/media/media_stream_center.h ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 470e31776a42d40ddc4ea5c202dac6c308295d0e..f5f5e7ad6d92a344fb83a66f118a0137f97f158d 100644
--- a/content/renderer/media/media_stream_center.cc
+++ b/content/renderer/media/media_stream_center.cc
@@ -86,20 +86,10 @@ void CreateNativeMediaStreamTrack(const blink::WebMediaStreamTrack& track,
MediaStreamCenter::MediaStreamCenter(blink::WebMediaStreamCenterClient* client,
PeerConnectionDependencyFactory* factory)
- : rtc_factory_(factory), next_request_id_(0) {}
+ : rtc_factory_(factory) {}
MediaStreamCenter::~MediaStreamCenter() {}
-bool MediaStreamCenter::getMediaStreamTrackSources(
- const blink::WebMediaStreamTrackSourcesRequest& request) {
- int request_id = next_request_id_++;
- requests_.insert(std::make_pair(request_id, request));
- RenderThread::Get()->Send(new MediaStreamHostMsg_GetSources(
- request_id,
- GURL(request.origin().utf8())));
- return true;
-}
-
void MediaStreamCenter::didCreateMediaStreamTrack(
const blink::WebMediaStreamTrack& track) {
DVLOG(1) << "MediaStreamCenter::didCreateMediaStreamTrack";
@@ -203,48 +193,4 @@ bool MediaStreamCenter::didRemoveMediaStreamTrack(
return native_stream->RemoveTrack(track);
}
-bool MediaStreamCenter::OnControlMessageReceived(const IPC::Message& message) {
- bool handled = true;
- IPC_BEGIN_MESSAGE_MAP(MediaStreamCenter, message)
- IPC_MESSAGE_HANDLER(MediaStreamMsg_GetSourcesACK,
- OnGetSourcesComplete)
- IPC_MESSAGE_UNHANDLED(handled = false)
- IPC_END_MESSAGE_MAP()
- return handled;
-}
-
-void MediaStreamCenter::OnGetSourcesComplete(
- int request_id,
- const content::StreamDeviceInfoArray& devices) {
- RequestMap::iterator request_it = requests_.find(request_id);
- DCHECK(request_it != requests_.end());
-
- 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);
- blink::WebSourceInfo::VideoFacingMode video_facing;
- switch (device.video_facing) {
- case MEDIA_VIDEO_FACING_USER:
- video_facing = blink::WebSourceInfo::VideoFacingModeUser;
- break;
- case MEDIA_VIDEO_FACING_ENVIRONMENT:
- video_facing = blink::WebSourceInfo::VideoFacingModeEnvironment;
- break;
- default:
- video_facing = blink::WebSourceInfo::VideoFacingModeNone;
- }
-
- sourceInfos[i]
- .initialize(blink::WebString::fromUTF8(device.id),
- device.type == MEDIA_DEVICE_AUDIO_CAPTURE
- ? blink::WebSourceInfo::SourceKindAudio
- : blink::WebSourceInfo::SourceKindVideo,
- blink::WebString::fromUTF8(device.name),
- video_facing);
- }
- request_it->second.requestSucceeded(sourceInfos);
-}
-
} // namespace content
« no previous file with comments | « content/renderer/media/media_stream_center.h ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698