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

Side by Side Diff: webrtc/pc/webrtcsession.cc

Issue 2732663004: Rename OnIceConnectionChange to OnIceConnectionStateChange for consistency with the WebRTC 1.0 stan… (Closed)
Patch Set: Created 3 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 | « webrtc/pc/webrtcsession.h ('k') | webrtc/pc/webrtcsession_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after
1418 if (ice_connection_state_ == state) { 1418 if (ice_connection_state_ == state) {
1419 return; 1419 return;
1420 } 1420 }
1421 1421
1422 LOG(LS_INFO) << "Changing IceConnectionState " << ice_connection_state_ 1422 LOG(LS_INFO) << "Changing IceConnectionState " << ice_connection_state_
1423 << " => " << state; 1423 << " => " << state;
1424 RTC_DCHECK(ice_connection_state_ != 1424 RTC_DCHECK(ice_connection_state_ !=
1425 PeerConnectionInterface::kIceConnectionClosed); 1425 PeerConnectionInterface::kIceConnectionClosed);
1426 ice_connection_state_ = state; 1426 ice_connection_state_ = state;
1427 if (ice_observer_) { 1427 if (ice_observer_) {
1428 ice_observer_->OnIceConnectionChange(ice_connection_state_); 1428 ice_observer_->OnIceConnectionStateChange(ice_connection_state_);
1429 } 1429 }
1430 } 1430 }
1431 1431
1432 void WebRtcSession::OnTransportControllerConnectionState( 1432 void WebRtcSession::OnTransportControllerConnectionState(
1433 cricket::IceConnectionState state) { 1433 cricket::IceConnectionState state) {
1434 switch (state) { 1434 switch (state) {
1435 case cricket::kIceConnectionConnecting: 1435 case cricket::kIceConnectionConnecting:
1436 // If the current state is Connected or Completed, then there were 1436 // If the current state is Connected or Completed, then there were
1437 // writable channels but now there are not, so the next state must 1437 // writable channels but now there are not, so the next state must
1438 // be Disconnected. 1438 // be Disconnected.
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after
2383 (rtp_data_channel_->rtcp_dtls_transport() != nullptr); 2383 (rtp_data_channel_->rtcp_dtls_transport() != nullptr);
2384 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); 2384 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release());
2385 transport_controller_->DestroyDtlsTransport( 2385 transport_controller_->DestroyDtlsTransport(
2386 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); 2386 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
2387 if (need_to_delete_rtcp) { 2387 if (need_to_delete_rtcp) {
2388 transport_controller_->DestroyDtlsTransport( 2388 transport_controller_->DestroyDtlsTransport(
2389 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); 2389 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
2390 } 2390 }
2391 } 2391 }
2392 } // namespace webrtc 2392 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/webrtcsession.h ('k') | webrtc/pc/webrtcsession_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698