Index: remoting/protocol/libjingle_transport_factory.cc |
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc |
index 83c59804b7ea0716a14af5d2f6c4438dcd782fb3..3f7c6a555270a5e38598c8b3290361c52e5621e1 100644 |
--- a/remoting/protocol/libjingle_transport_factory.cc |
+++ b/remoting/protocol/libjingle_transport_factory.cc |
@@ -78,9 +78,7 @@ class LibjingleTransport |
void DoStart(); |
void NotifyConnected(); |
- // Signal handlers for cricket::TransportChannel. |
- void OnRequestSignaling(cricket::TransportChannelImpl* channel); |
- void OnCandidateReady(cricket::TransportChannelImpl* channel, |
+ void OnCandidateGathered(cricket::TransportChannelImpl* channel, |
const cricket::Candidate& candidate); |
Sergey Ulanov
2015/09/04 18:37:32
update indentation please
Taylor_Brandstetter
2015/09/04 18:58:59
Done.
|
void OnRouteChange(cricket::TransportChannel* channel, |
const cricket::Candidate& candidate); |
@@ -161,7 +159,7 @@ void LibjingleTransport::OnCanStart() { |
} |
while (!pending_candidates_.empty()) { |
- channel_->OnCandidate(pending_candidates_.front()); |
+ channel_->AddRemoteCandidate(pending_candidates_.front()); |
pending_candidates_.pop_front(); |
} |
} |
@@ -198,10 +196,8 @@ void LibjingleTransport::DoStart() { |
event_handler_->OnTransportIceCredentials(this, ice_username_fragment_, |
ice_password); |
channel_->SetIceCredentials(ice_username_fragment_, ice_password); |
- channel_->SignalRequestSignaling.connect( |
- this, &LibjingleTransport::OnRequestSignaling); |
- channel_->SignalCandidateReady.connect( |
- this, &LibjingleTransport::OnCandidateReady); |
+ channel_->SignalCandidateGathered.connect( |
+ this, &LibjingleTransport::OnCandidateGathered); |
channel_->SignalRouteChange.connect( |
this, &LibjingleTransport::OnRouteChange); |
channel_->SignalWritableState.connect( |
@@ -255,7 +251,7 @@ void LibjingleTransport::AddRemoteCandidate( |
return; |
if (channel_) { |
- channel_->OnCandidate(candidate); |
+ channel_->AddRemoteCandidate(candidate); |
} else { |
pending_candidates_.push_back(candidate); |
} |
@@ -271,13 +267,7 @@ bool LibjingleTransport::is_connected() const { |
return callback_.is_null(); |
} |
-void LibjingleTransport::OnRequestSignaling( |
- cricket::TransportChannelImpl* channel) { |
- DCHECK(CalledOnValidThread()); |
- channel_->OnSignalingReady(); |
-} |
- |
-void LibjingleTransport::OnCandidateReady( |
+void LibjingleTransport::OnCandidateGathered( |
cricket::TransportChannelImpl* channel, |
const cricket::Candidate& candidate) { |
DCHECK(CalledOnValidThread()); |