zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland of "Remove the obsolete enum webrtc::PeerConnectionInterface::IceState."

Browse Source 
Original commit https://codereview.webrtc.org/2256663002
was reverted by https://codereview.webrtc.org/2290963002 .

BUG=webrtc:6299
TBR=pthatcher@webrtc.org

Review-Url: https://codereview.webrtc.org/2361053003
Cr-Commit-Position: refs/heads/master@{#14584}
This commit is contained in:
johan
2016-10-10 03:25:57 -07:00
committed by Commit bot
parent d36dd499c8
commit fc9414ab51
4 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
webrtc/api/peerconnectioninterface.h
View File

@ -152,19 +152,6 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
kClosed,
};
// TODO(bemasc): Remove IceState when callers are changed to
// IceConnection/GatheringState.
enum IceState {
kIceNew,
kIceGathering,
kIceWaiting,
kIceChecking,
kIceConnected,
kIceCompleted,
kIceFailed,
kIceClosed,
};
enum IceGatheringState {
kIceGatheringNew,
kIceGatheringGathering,
@ -522,14 +509,6 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
// Returns the current SignalingState.
virtual SignalingState signaling_state() = 0;
// TODO(bemasc): Remove ice_state when callers are changed to
// IceConnection/GatheringState.
// Returns the current IceState.
virtual IceState ice_state() {
RTC_NOTREACHED();
return kIceNew;
}
virtual IceConnectionState ice_connection_state() = 0;
virtual IceGatheringState ice_gathering_state() = 0;