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

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

Issue 178073008: Removed the outdated TODO and the redundant includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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 unified diff | Download patch
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/rtc_peer_connection_handler.h" 5 #include "content/renderer/media/rtc_peer_connection_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
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 "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "content/public/common/content_switches.h" 16 #include "content/public/common/content_switches.h"
17 #include "content/renderer/media/media_stream_audio_source.h" 17 #include "content/renderer/media/media_stream_audio_source.h"
18 #include "content/renderer/media/media_stream_dependency_factory.h" 18 #include "content/renderer/media/media_stream_dependency_factory.h"
19 #include "content/renderer/media/media_stream_track.h" 19 #include "content/renderer/media/media_stream_track.h"
20 #include "content/renderer/media/peer_connection_tracker.h" 20 #include "content/renderer/media/peer_connection_tracker.h"
21 #include "content/renderer/media/remote_media_stream_impl.h" 21 #include "content/renderer/media/remote_media_stream_impl.h"
22 #include "content/renderer/media/rtc_data_channel_handler.h" 22 #include "content/renderer/media/rtc_data_channel_handler.h"
23 #include "content/renderer/media/rtc_dtmf_sender_handler.h" 23 #include "content/renderer/media/rtc_dtmf_sender_handler.h"
24 #include "content/renderer/media/rtc_media_constraints.h" 24 #include "content/renderer/media/rtc_media_constraints.h"
25 #include "content/renderer/media/webrtc_audio_capturer.h" 25 #include "content/renderer/media/webrtc_audio_capturer.h"
26 #include "content/renderer/media/webrtc_audio_device_impl.h" 26 #include "content/renderer/media/webrtc_audio_device_impl.h"
27 #include "content/renderer/render_thread_impl.h" 27 #include "content/renderer/render_thread_impl.h"
28 #include "third_party/WebKit/public/platform/WebMediaConstraints.h" 28 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
29 // TODO(hta): Move the following include to WebRTCStatsRequest.h file.
30 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 29 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
31 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
32 #include "third_party/WebKit/public/platform/WebRTCConfiguration.h" 30 #include "third_party/WebKit/public/platform/WebRTCConfiguration.h"
33 #include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h" 31 #include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h"
34 #include "third_party/WebKit/public/platform/WebRTCICECandidate.h" 32 #include "third_party/WebKit/public/platform/WebRTCICECandidate.h"
35 #include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.h "
36 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h" 33 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h"
37 #include "third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h" 34 #include "third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h"
38 #include "third_party/WebKit/public/platform/WebRTCStatsRequest.h"
39 #include "third_party/WebKit/public/platform/WebRTCVoidRequest.h" 35 #include "third_party/WebKit/public/platform/WebRTCVoidRequest.h"
40 #include "third_party/WebKit/public/platform/WebURL.h"
41 #include "third_party/WebKit/public/web/WebFrame.h"
42 36
43 namespace content { 37 namespace content {
44 38
45 // Converter functions from libjingle types to WebKit types. 39 // Converter functions from libjingle types to WebKit types.
46 blink::WebRTCPeerConnectionHandlerClient::ICEGatheringState 40 blink::WebRTCPeerConnectionHandlerClient::ICEGatheringState
47 GetWebKitIceGatheringState( 41 GetWebKitIceGatheringState(
48 webrtc::PeerConnectionInterface::IceGatheringState state) { 42 webrtc::PeerConnectionInterface::IceGatheringState state) {
49 using blink::WebRTCPeerConnectionHandlerClient; 43 using blink::WebRTCPeerConnectionHandlerClient;
50 switch (state) { 44 switch (state) {
51 case webrtc::PeerConnectionInterface::kIceGatheringNew: 45 case webrtc::PeerConnectionInterface::kIceGatheringNew:
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 webrtc::SessionDescriptionInterface* native_desc = 822 webrtc::SessionDescriptionInterface* native_desc =
829 dependency_factory_->CreateSessionDescription(type, sdp, error); 823 dependency_factory_->CreateSessionDescription(type, sdp, error);
830 824
831 LOG_IF(ERROR, !native_desc) << "Failed to create native session description." 825 LOG_IF(ERROR, !native_desc) << "Failed to create native session description."
832 << " Type: " << type << " SDP: " << sdp; 826 << " Type: " << type << " SDP: " << sdp;
833 827
834 return native_desc; 828 return native_desc;
835 } 829 }
836 830
837 } // namespace content 831 } // namespace content
OLDNEW
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698