| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright 2012 The WebRTC Project Authors. All rights reserved. | 2  *  Copyright 2012 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_TRANSPORTDESCRIPTION_H_ | 11 #ifndef WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_ | 
| 12 #define WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_ | 12 #define WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_ | 
| 13 | 13 | 
| 14 #include <algorithm> | 14 #include <algorithm> | 
|  | 15 #include <memory> | 
| 15 #include <string> | 16 #include <string> | 
| 16 #include <vector> | 17 #include <vector> | 
| 17 | 18 | 
| 18 #include "webrtc/p2p/base/p2pconstants.h" | 19 #include "webrtc/p2p/base/p2pconstants.h" | 
| 19 #include "webrtc/base/scoped_ptr.h" | 20 #include "webrtc/base/scoped_ptr.h" | 
| 20 #include "webrtc/base/sslfingerprint.h" | 21 #include "webrtc/base/sslfingerprint.h" | 
| 21 | 22 | 
| 22 namespace cricket { | 23 namespace cricket { | 
| 23 | 24 | 
| 24 // SEC_ENABLED and SEC_REQUIRED should only be used if the session | 25 // SEC_ENABLED and SEC_REQUIRED should only be used if the session | 
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 132 | 133 | 
| 133     return new rtc::SSLFingerprint(*from); | 134     return new rtc::SSLFingerprint(*from); | 
| 134   } | 135   } | 
| 135 | 136 | 
| 136   std::vector<std::string> transport_options; | 137   std::vector<std::string> transport_options; | 
| 137   std::string ice_ufrag; | 138   std::string ice_ufrag; | 
| 138   std::string ice_pwd; | 139   std::string ice_pwd; | 
| 139   IceMode ice_mode; | 140   IceMode ice_mode; | 
| 140   ConnectionRole connection_role; | 141   ConnectionRole connection_role; | 
| 141 | 142 | 
| 142   rtc::scoped_ptr<rtc::SSLFingerprint> identity_fingerprint; | 143   std::unique_ptr<rtc::SSLFingerprint> identity_fingerprint; | 
| 143 }; | 144 }; | 
| 144 | 145 | 
| 145 }  // namespace cricket | 146 }  // namespace cricket | 
| 146 | 147 | 
| 147 #endif  // WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_ | 148 #endif  // WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_ | 
| OLD | NEW | 
|---|