| OLD | NEW |
| 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" | |
| 31 #include "third_party/WebKit/public/platform/WebVector.h" | 29 #include "third_party/WebKit/public/platform/WebVector.h" |
| 32 #include "third_party/WebKit/public/web/WebFrame.h" | 30 #include "third_party/WebKit/public/web/WebFrame.h" |
| 33 | 31 |
| 34 using blink::WebFrame; | 32 using blink::WebFrame; |
| 35 using blink::WebView; | 33 using blink::WebView; |
| 36 | 34 |
| 37 namespace content { | 35 namespace content { |
| 38 | 36 |
| 39 namespace { | 37 namespace { |
| 40 | 38 |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 | 190 |
| 193 bool MediaStreamCenter::didRemoveMediaStreamTrack( | 191 bool MediaStreamCenter::didRemoveMediaStreamTrack( |
| 194 const blink::WebMediaStream& stream, | 192 const blink::WebMediaStream& stream, |
| 195 const blink::WebMediaStreamTrack& track) { | 193 const blink::WebMediaStreamTrack& track) { |
| 196 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack"; | 194 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack"; |
| 197 MediaStream* native_stream = MediaStream::GetMediaStream(stream); | 195 MediaStream* native_stream = MediaStream::GetMediaStream(stream); |
| 198 return native_stream->RemoveTrack(track); | 196 return native_stream->RemoveTrack(track); |
| 199 } | 197 } |
| 200 | 198 |
| 201 } // namespace content | 199 } // namespace content |
| OLD | NEW |