Chromium Code Reviews| Index: webrtc/p2p/base/transportchannelimpl.h |
| diff --git a/webrtc/p2p/base/transportchannelimpl.h b/webrtc/p2p/base/transportchannelimpl.h |
| index 59065a10a8258d93e1416588ff38f187036e2441..a90900e302a5f67f9df7ebd5a480ad43ca34ee92 100644 |
| --- a/webrtc/p2p/base/transportchannelimpl.h |
| +++ b/webrtc/p2p/base/transportchannelimpl.h |
| @@ -44,15 +44,24 @@ class TransportChannelImpl : public TransportChannel { |
| // TODO(pthatcher): Remove this once it's no longer called in |
| // remoting/protocol/libjingle_transport_factory.cc |
| virtual void SetIceProtocolType(IceProtocolType type) {} |
| - // SetIceCredentials only need to be implemented by the ICE |
| - // transport channels. Non-ICE transport channels can just ignore. |
| - // The ufrag and pwd must be set before candidate gathering can start. |
| + // TODO(honghaiz): Remove this once the call in chromoting is removed. |
| virtual void SetIceCredentials(const std::string& ice_ufrag, |
| - const std::string& ice_pwd) = 0; |
| - // SetRemoteIceCredentials only need to be implemented by the ICE |
| - // transport channels. Non-ICE transport channels can just ignore. |
| + const std::string& ice_pwd) { |
| + SetIceParameters(IceParameters(ice_ufrag, ice_pwd, false)); |
| + } |
| + // TODO(honghaiz): Remove this once the call in chromoting is removed. |
| virtual void SetRemoteIceCredentials(const std::string& ice_ufrag, |
| - const std::string& ice_pwd) = 0; |
| + const std::string& ice_pwd) { |
| + SetRemoteIceParameters(IceParameters(ice_ufrag, ice_pwd, false)); |
| + } |
| + |
| + // SetIceParameters only needs to be implemented by the ICE transport |
| + // channels. Non-ICE transport channels can just ignore. The ufrag and pwd |
| + // in the ice_params must be set before candidate gathering can start. |
|
pthatcher1
2016/08/08 21:56:23
Non-ICE transport channels can't ignore them if th
Taylor Brandstetter
2016/08/08 22:28:16
nit: "in the ice_params" -> "in |ice_params|" to m
honghaiz3
2016/08/11 04:57:57
Done.
honghaiz3
2016/08/11 04:57:57
I am not sure in what circumstance a Non-ICE trans
|
| + virtual void SetIceParameters(const IceParameters& ice_params) = 0; |
| + // SetRemoteIceParameters only needs to be implemented by the ICE transport |
| + // channels. Non-ICE transport channels can just ignore this. |
| + virtual void SetRemoteIceParameters(const IceParameters& ice_params) = 0; |
| // SetRemoteIceMode must be implemented only by the ICE transport channels. |
| virtual void SetRemoteIceMode(IceMode mode) = 0; |