| Index: webrtc/p2p/base/dtlstransportchannel.h
|
| diff --git a/webrtc/p2p/base/dtlstransportchannel.h b/webrtc/p2p/base/dtlstransportchannel.h
|
| index 1bf77b6566a44cf958aa38e9535a1fd098f4cd43..862debdd82f52efde9e42ebf7343f4235e9b71a8 100644
|
| --- a/webrtc/p2p/base/dtlstransportchannel.h
|
| +++ b/webrtc/p2p/base/dtlstransportchannel.h
|
| @@ -27,7 +27,7 @@ namespace cricket {
|
| // the bottom and a StreamInterface on the top.
|
| class StreamInterfaceChannel : public rtc::StreamInterface {
|
| public:
|
| - StreamInterfaceChannel(TransportChannel* channel);
|
| + explicit StreamInterfaceChannel(TransportChannel* channel);
|
|
|
| // Push in a packet; this gets pulled out from Read().
|
| bool OnPacketReceived(const char* data, size_t size);
|
| @@ -197,9 +197,10 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl {
|
|
|
| virtual void Connect();
|
|
|
| - virtual void OnSignalingReady() {
|
| - channel_->OnSignalingReady();
|
| + virtual Transport::CandidateGatheringState candidate_gathering_state() const {
|
| + return channel_->candidate_gathering_state();
|
| }
|
| +
|
| virtual void OnCandidate(const Candidate& candidate) {
|
| channel_->OnCandidate(candidate);
|
| }
|
| @@ -222,7 +223,7 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl {
|
| bool SetupDtls();
|
| bool MaybeStartDtls();
|
| bool HandleDtlsPacket(const char* data, size_t size);
|
| - void OnRequestSignaling(TransportChannelImpl* channel);
|
| + void OnCandidatesAllocationStarted(TransportChannelImpl* channel);
|
| void OnCandidateReady(TransportChannelImpl* channel, const Candidate& c);
|
| void OnCandidatesAllocationDone(TransportChannelImpl* channel);
|
| void OnRoleConflict(TransportChannelImpl* channel);
|
|
|