| 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/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 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #include "content/renderer/media/webrtc_audio_device_impl.h" | 28 #include "content/renderer/media/webrtc_audio_device_impl.h" |
| 29 #include "content/renderer/render_thread_impl.h" | 29 #include "content/renderer/render_thread_impl.h" |
| 30 #include "third_party/WebKit/public/platform/WebMediaConstraints.h" | 30 #include "third_party/WebKit/public/platform/WebMediaConstraints.h" |
| 31 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" | 31 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" |
| 32 #include "third_party/WebKit/public/platform/WebRTCConfiguration.h" | 32 #include "third_party/WebKit/public/platform/WebRTCConfiguration.h" |
| 33 #include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h" | 33 #include "third_party/WebKit/public/platform/WebRTCDataChannelInit.h" |
| 34 #include "third_party/WebKit/public/platform/WebRTCICECandidate.h" | 34 #include "third_party/WebKit/public/platform/WebRTCICECandidate.h" |
| 35 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h" | 35 #include "third_party/WebKit/public/platform/WebRTCSessionDescription.h" |
| 36 #include "third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h" | 36 #include "third_party/WebKit/public/platform/WebRTCSessionDescriptionRequest.h" |
| 37 #include "third_party/WebKit/public/platform/WebRTCVoidRequest.h" | 37 #include "third_party/WebKit/public/platform/WebRTCVoidRequest.h" |
| 38 #include "third_party/WebKit/public/platform/WebURL.h" |
| 38 | 39 |
| 39 namespace content { | 40 namespace content { |
| 40 | 41 |
| 41 // Converter functions from libjingle types to WebKit types. | 42 // Converter functions from libjingle types to WebKit types. |
| 42 blink::WebRTCPeerConnectionHandlerClient::ICEGatheringState | 43 blink::WebRTCPeerConnectionHandlerClient::ICEGatheringState |
| 43 GetWebKitIceGatheringState( | 44 GetWebKitIceGatheringState( |
| 44 webrtc::PeerConnectionInterface::IceGatheringState state) { | 45 webrtc::PeerConnectionInterface::IceGatheringState state) { |
| 45 using blink::WebRTCPeerConnectionHandlerClient; | 46 using blink::WebRTCPeerConnectionHandlerClient; |
| 46 switch (state) { | 47 switch (state) { |
| 47 case webrtc::PeerConnectionInterface::kIceGatheringNew: | 48 case webrtc::PeerConnectionInterface::kIceGatheringNew: |
| (...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 832 webrtc::SessionDescriptionInterface* native_desc = | 833 webrtc::SessionDescriptionInterface* native_desc = |
| 833 dependency_factory_->CreateSessionDescription(type, sdp, error); | 834 dependency_factory_->CreateSessionDescription(type, sdp, error); |
| 834 | 835 |
| 835 LOG_IF(ERROR, !native_desc) << "Failed to create native session description." | 836 LOG_IF(ERROR, !native_desc) << "Failed to create native session description." |
| 836 << " Type: " << type << " SDP: " << sdp; | 837 << " Type: " << type << " SDP: " << sdp; |
| 837 | 838 |
| 838 return native_desc; | 839 return native_desc; |
| 839 } | 840 } |
| 840 | 841 |
| 841 } // namespace content | 842 } // namespace content |
| OLD | NEW |