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

Side by Side Diff: content/renderer/media/media_stream_center.cc

Issue 2481263004: Revert of Remove MediaStreamTrack.getSources(). (Closed)
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_stream_center.h" 5 #include "content/renderer/media/media_stream_center.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "content/common/media/media_stream_messages.h" 13 #include "content/common/media/media_stream_messages.h"
14 #include "content/public/common/content_switches.h" 14 #include "content/public/common/content_switches.h"
15 #include "content/public/renderer/media_stream_audio_sink.h" 15 #include "content/public/renderer/media_stream_audio_sink.h"
16 #include "content/public/renderer/render_thread.h" 16 #include "content/public/renderer/render_thread.h"
17 #include "content/renderer/media/media_stream.h" 17 #include "content/renderer/media/media_stream.h"
18 #include "content/renderer/media/media_stream_audio_track.h" 18 #include "content/renderer/media/media_stream_audio_track.h"
19 #include "content/renderer/media/media_stream_source.h" 19 #include "content/renderer/media/media_stream_source.h"
20 #include "content/renderer/media/media_stream_video_source.h" 20 #include "content/renderer/media/media_stream_video_source.h"
21 #include "content/renderer/media/media_stream_video_track.h" 21 #include "content/renderer/media/media_stream_video_track.h"
22 #include "content/renderer/media/webaudio_media_stream_source.h" 22 #include "content/renderer/media/webaudio_media_stream_source.h"
23 #include "content/renderer/media/webrtc_local_audio_source_provider.h" 23 #include "content/renderer/media/webrtc_local_audio_source_provider.h"
24 #include "third_party/WebKit/public/platform/WebMediaConstraints.h" 24 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
25 #include "third_party/WebKit/public/platform/WebMediaStream.h" 25 #include "third_party/WebKit/public/platform/WebMediaStream.h"
26 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h" 26 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h"
27 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 27 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
28 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 28 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
29 #include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h "
30 #include "third_party/WebKit/public/platform/WebSourceInfo.h"
29 #include "third_party/WebKit/public/platform/WebVector.h" 31 #include "third_party/WebKit/public/platform/WebVector.h"
30 #include "third_party/WebKit/public/web/WebFrame.h" 32 #include "third_party/WebKit/public/web/WebFrame.h"
31 33
32 using blink::WebFrame; 34 using blink::WebFrame;
33 using blink::WebView; 35 using blink::WebView;
34 36
35 namespace content { 37 namespace content {
36 38
37 namespace { 39 namespace {
38 40
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 192
191 bool MediaStreamCenter::didRemoveMediaStreamTrack( 193 bool MediaStreamCenter::didRemoveMediaStreamTrack(
192 const blink::WebMediaStream& stream, 194 const blink::WebMediaStream& stream,
193 const blink::WebMediaStreamTrack& track) { 195 const blink::WebMediaStreamTrack& track) {
194 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack"; 196 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack";
195 MediaStream* native_stream = MediaStream::GetMediaStream(stream); 197 MediaStream* native_stream = MediaStream::GetMediaStream(stream);
196 return native_stream->RemoveTrack(track); 198 return native_stream->RemoveTrack(track);
197 } 199 }
198 200
199 } // namespace content 201 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_center.h ('k') | content/renderer/media/user_media_client_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698