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

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

Issue 1362503003: Use suffixed {uint,int}{8,16,32,64}_t types. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase + revert basictypes.h (to be landed separately just in case of a revert due to unexpected us… Created 5 years, 2 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/transportchannelimpl.h ('k') | webrtc/p2p/base/turnport.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 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 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
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 // Aggregate state for TransportChannelImpls. 207 // Aggregate state for TransportChannelImpls.
208 IceConnectionState connection_state_ = kIceConnectionConnecting; 208 IceConnectionState connection_state_ = kIceConnectionConnecting;
209 bool receiving_ = false; 209 bool receiving_ = false;
210 IceGatheringState gathering_state_ = kIceGatheringNew; 210 IceGatheringState gathering_state_ = kIceGatheringNew;
211 211
212 // TODO(deadbeef): Move the fields below down to the transports themselves 212 // TODO(deadbeef): Move the fields below down to the transports themselves
213 IceConfig ice_config_; 213 IceConfig ice_config_;
214 IceRole ice_role_ = ICEROLE_CONTROLLING; 214 IceRole ice_role_ = ICEROLE_CONTROLLING;
215 // Flag which will be set to true after the first role switch 215 // Flag which will be set to true after the first role switch
216 bool ice_role_switch_ = false; 216 bool ice_role_switch_ = false;
217 uint64 ice_tiebreaker_ = rtc::CreateRandomId64(); 217 uint64_t ice_tiebreaker_ = rtc::CreateRandomId64();
218 rtc::scoped_refptr<rtc::RTCCertificate> certificate_; 218 rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
219 }; 219 };
220 220
221 } // namespace cricket 221 } // namespace cricket
222 222
223 #endif // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_ 223 #endif // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/transportchannelimpl.h ('k') | webrtc/p2p/base/turnport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698