| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef REMOTING_PROTOCOL_ICE_TRANSPORT_H_ | 5 #ifndef REMOTING_PROTOCOL_ICE_TRANSPORT_H_ |
| 6 #define REMOTING_PROTOCOL_ICE_TRANSPORT_H_ | 6 #define REMOTING_PROTOCOL_ICE_TRANSPORT_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <map> | 9 #include <map> |
| 10 | 10 |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 // Callback passed to StreamMessageChannelFactoryAdapter to handle read/write | 84 // Callback passed to StreamMessageChannelFactoryAdapter to handle read/write |
| 85 // errors on the data channels. | 85 // errors on the data channels. |
| 86 void OnChannelError(int error); | 86 void OnChannelError(int error); |
| 87 | 87 |
| 88 scoped_refptr<TransportContext> transport_context_; | 88 scoped_refptr<TransportContext> transport_context_; |
| 89 EventHandler* event_handler_; | 89 EventHandler* event_handler_; |
| 90 | 90 |
| 91 SendTransportInfoCallback send_transport_info_callback_; | 91 SendTransportInfoCallback send_transport_info_callback_; |
| 92 | 92 |
| 93 ChannelsMap channels_; | 93 ChannelsMap channels_; |
| 94 scoped_ptr<PseudoTcpChannelFactory> pseudotcp_channel_factory_; | 94 std::unique_ptr<PseudoTcpChannelFactory> pseudotcp_channel_factory_; |
| 95 scoped_ptr<SecureChannelFactory> secure_channel_factory_; | 95 std::unique_ptr<SecureChannelFactory> secure_channel_factory_; |
| 96 scoped_ptr<MessageChannelFactory> message_channel_factory_; | 96 std::unique_ptr<MessageChannelFactory> message_channel_factory_; |
| 97 | 97 |
| 98 scoped_ptr<ChannelMultiplexer> channel_multiplexer_; | 98 std::unique_ptr<ChannelMultiplexer> channel_multiplexer_; |
| 99 scoped_ptr<MessageChannelFactory> mux_channel_factory_; | 99 std::unique_ptr<MessageChannelFactory> mux_channel_factory_; |
| 100 | 100 |
| 101 // Pending remote transport info received before the local channels were | 101 // Pending remote transport info received before the local channels were |
| 102 // created. | 102 // created. |
| 103 std::list<IceTransportInfo::IceCredentials> pending_remote_ice_credentials_; | 103 std::list<IceTransportInfo::IceCredentials> pending_remote_ice_credentials_; |
| 104 std::list<IceTransportInfo::NamedCandidate> pending_remote_candidates_; | 104 std::list<IceTransportInfo::NamedCandidate> pending_remote_candidates_; |
| 105 | 105 |
| 106 scoped_ptr<IceTransportInfo> pending_transport_info_message_; | 106 std::unique_ptr<IceTransportInfo> pending_transport_info_message_; |
| 107 base::OneShotTimer transport_info_timer_; | 107 base::OneShotTimer transport_info_timer_; |
| 108 | 108 |
| 109 base::WeakPtrFactory<IceTransport> weak_factory_; | 109 base::WeakPtrFactory<IceTransport> weak_factory_; |
| 110 | 110 |
| 111 DISALLOW_COPY_AND_ASSIGN(IceTransport); | 111 DISALLOW_COPY_AND_ASSIGN(IceTransport); |
| 112 }; | 112 }; |
| 113 | 113 |
| 114 } // namespace protocol | 114 } // namespace protocol |
| 115 } // namespace remoting | 115 } // namespace remoting |
| 116 | 116 |
| 117 #endif // REMOTING_PROTOCOL_ICE_TRANSPORT_H_ | 117 #endif // REMOTING_PROTOCOL_ICE_TRANSPORT_H_ |
| 118 | 118 |
| OLD | NEW |