| Index: webrtc/api/peerconnection.h
|
| diff --git a/webrtc/api/peerconnection.h b/webrtc/api/peerconnection.h
|
| index 740958528dacbb0737bc20bb0bc0667f36d6357a..e23c02a25125e4dc5f1d1a26544a0ccd9fa17f6a 100644
|
| --- a/webrtc/api/peerconnection.h
|
| +++ b/webrtc/api/peerconnection.h
|
| @@ -129,6 +129,7 @@ class PeerConnection : public PeerConnectionInterface,
|
| SessionDescriptionInterface* desc) override;
|
| void SetRemoteDescription(SetSessionDescriptionObserver* observer,
|
| SessionDescriptionInterface* desc) override;
|
| + PeerConnectionInterface::RTCConfiguration GetConfiguration() override;
|
| bool SetConfiguration(
|
| const PeerConnectionInterface::RTCConfiguration& configuration) override;
|
| bool AddIceCandidate(const IceCandidateInterface* candidate) override;
|
| @@ -387,6 +388,7 @@ class PeerConnection : public PeerConnectionInterface,
|
| SignalingState signaling_state_;
|
| IceConnectionState ice_connection_state_;
|
| IceGatheringState ice_gathering_state_;
|
| + PeerConnectionInterface::RTCConfiguration configuration_;
|
|
|
| std::unique_ptr<cricket::PortAllocator> port_allocator_;
|
| // The EventLog needs to outlive the media controller.
|
| @@ -418,8 +420,6 @@ class PeerConnection : public PeerConnectionInterface,
|
|
|
| bool remote_peer_supports_msid_ = false;
|
|
|
| - bool enable_ice_renomination_ = false;
|
| -
|
| std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>>
|
| senders_;
|
| std::vector<
|
|
|