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

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

Issue 15822010: Update refernces to Blink's Platform API (content) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
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/utf_string_conversions.h" 15 #include "base/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_dependency_factory.h" 17 #include "content/renderer/media/media_stream_dependency_factory.h"
18 #include "content/renderer/media/peer_connection_tracker.h" 18 #include "content/renderer/media/peer_connection_tracker.h"
19 #include "content/renderer/media/remote_media_stream_impl.h" 19 #include "content/renderer/media/remote_media_stream_impl.h"
20 #include "content/renderer/media/rtc_data_channel_handler.h" 20 #include "content/renderer/media/rtc_data_channel_handler.h"
21 #include "content/renderer/media/rtc_dtmf_sender_handler.h" 21 #include "content/renderer/media/rtc_dtmf_sender_handler.h"
22 #include "content/renderer/media/rtc_media_constraints.h" 22 #include "content/renderer/media/rtc_media_constraints.h"
23 #include "content/renderer/render_thread_impl.h" 23 #include "content/renderer/render_thread_impl.h"
24 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints .h" 24 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
25 // TODO(hta): Move the following include to WebRTCStatsRequest.h file. 25 // TODO(hta): Move the following include to WebRTCStatsRequest.h file.
26 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSourc e.h" 26 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
27 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack .h" 27 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
28 #include "third_party/WebKit/Source/Platform/chromium/public/WebRTCConfiguration .h" 28 #include "third_party/WebKit/public/platform/WebRTCConfiguration.h"
29 #include "third_party/WebKit/Source/Platform/chromium/public/WebRTCICECandidate. h" 29 #include "third_party/WebKit/public/platform/WebRTCICECandidate.h"
30 #include "third_party/WebKit/Source/Platform/chromium/public/WebRTCPeerConnectio nHandlerClient.h" 30 #include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.h "
31 #include "third_party/WebKit/Source/Platform/chromium/public/WebRTCSessionDescri ption.h" 31 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h"
32 #include "third_party/WebKit/Source/Platform/chromium/public/WebRTCSessionDescri ptionRequest.h" 32 #include "third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h"
33 #include "third_party/WebKit/Source/Platform/chromium/public/WebRTCStatsRequest. h" 33 #include "third_party/WebKit/public/platform/WebRTCStatsRequest.h"
34 #include "third_party/WebKit/Source/Platform/chromium/public/WebRTCVoidRequest.h " 34 #include "third_party/WebKit/public/platform/WebRTCVoidRequest.h"
35 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" 35 #include "third_party/WebKit/public/platform/WebURL.h"
36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
37 37
38 namespace content { 38 namespace content {
39 39
40 // Converter functions from libjingle types to WebKit types. 40 // Converter functions from libjingle types to WebKit types.
41 WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState 41 WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState
42 GetWebKitIceGatheringState( 42 GetWebKitIceGatheringState(
43 webrtc::PeerConnectionInterface::IceGatheringState state) { 43 webrtc::PeerConnectionInterface::IceGatheringState state) {
44 using WebKit::WebRTCPeerConnectionHandlerClient; 44 using WebKit::WebRTCPeerConnectionHandlerClient;
45 switch (state) { 45 switch (state) {
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 webrtc::SessionDescriptionInterface* native_desc = 760 webrtc::SessionDescriptionInterface* native_desc =
761 dependency_factory_->CreateSessionDescription(type, sdp, error); 761 dependency_factory_->CreateSessionDescription(type, sdp, error);
762 762
763 LOG_IF(ERROR, !native_desc) << "Failed to create native session description." 763 LOG_IF(ERROR, !native_desc) << "Failed to create native session description."
764 << " Type: " << type << " SDP: " << sdp; 764 << " Type: " << type << " SDP: " << sdp;
765 765
766 return native_desc; 766 return native_desc;
767 } 767 }
768 768
769 } // namespace content 769 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_peer_connection_handler.h ('k') | content/renderer/media/rtc_peer_connection_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698