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

Side by Side Diff: webrtc/p2p/base/icetransportinternal.h

Issue 2606123002: Remove the dependency of TransportChannel and TransportChannelImpl. (Closed)
Patch Set: Fix the memory leak. Created 3 years, 11 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/p2p/base/faketransportcontroller.h ('k') | webrtc/p2p/base/jseptransport.h » ('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 2016 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2016 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
11 #ifndef WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_ 11 #ifndef WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_
12 #define WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_ 12 #define WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_
13 13
14 #include <string> 14 #include <string>
15 15
16 #include "webrtc/p2p/base/candidate.h" 16 #include "webrtc/p2p/base/candidate.h"
17 #include "webrtc/p2p/base/candidatepairinterface.h" 17 #include "webrtc/p2p/base/candidatepairinterface.h"
18 #include "webrtc/p2p/base/jseptransport.h" 18 #include "webrtc/p2p/base/jseptransport.h"
19 #include "webrtc/p2p/base/packettransportinterface.h" 19 #include "webrtc/p2p/base/packettransportinterface.h"
20 #include "webrtc/p2p/base/transportdescription.h" 20 #include "webrtc/p2p/base/transportdescription.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 class MetricsObserverInterface; 23 class MetricsObserverInterface;
24 } 24 }
25 25
26 namespace cricket { 26 namespace cricket {
27 27
28 // TODO(zhihuang): replace it with PeerConnectionInterface::IceConnectionState. 28 class IceTransportInternal;
29 typedef IceTransportInternal IceTransportInternal2;
30
31 // TODO(zhihuang): Replace this with
32 // PeerConnectionInterface::IceConnectionState.
29 enum class IceTransportState { 33 enum class IceTransportState {
30 STATE_INIT, 34 STATE_INIT,
31 STATE_CONNECTING, // Will enter this state once a connection is created 35 STATE_CONNECTING, // Will enter this state once a connection is created
32 STATE_COMPLETED, 36 STATE_COMPLETED,
33 STATE_FAILED 37 STATE_FAILED
34 }; 38 };
35 39
36 // TODO(zhihuang): Remove this once it's no longer used in 40 // TODO(zhihuang): Remove this once it's no longer used in
37 // remoting/protocol/libjingle_transport_factory.cc 41 // remoting/protocol/libjingle_transport_factory.cc
38 enum IceProtocolType { 42 enum IceProtocolType {
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 // agents. 131 // agents.
128 sigslot::signal1<IceTransportInternal*> SignalRoleConflict; 132 sigslot::signal1<IceTransportInternal*> SignalRoleConflict;
129 133
130 // Emitted whenever the transport state changed. 134 // Emitted whenever the transport state changed.
131 sigslot::signal1<IceTransportInternal*> SignalStateChanged; 135 sigslot::signal1<IceTransportInternal*> SignalStateChanged;
132 136
133 // Invoked when the transport is being destroyed. 137 // Invoked when the transport is being destroyed.
134 sigslot::signal1<IceTransportInternal*> SignalDestroyed; 138 sigslot::signal1<IceTransportInternal*> SignalDestroyed;
135 139
136 // Debugging description of this transport. 140 // Debugging description of this transport.
137 const std::string debug_name() const override { 141 std::string debug_name() const override {
138 return transport_name() + " " + std::to_string(component()); 142 return transport_name() + " " + std::to_string(component());
139 } 143 }
140 }; 144 };
141 145
142 } // namespace cricket 146 } // namespace cricket
143 147
144 #endif // WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_ 148 #endif // WEBRTC_P2P_BASE_ICETRANSPORTINTERNAL_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/faketransportcontroller.h ('k') | webrtc/p2p/base/jseptransport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698