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

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

Issue 1965063003: Revert of Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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/testrelayserver.h ('k') | webrtc/p2p/client/basicportallocator.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 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 <memory>
16 #include <string> 16 #include <string>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/p2p/base/p2pconstants.h" 19 #include "webrtc/p2p/base/p2pconstants.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
25 // was negotiated over TLS, to protect the inline crypto material 26 // was negotiated over TLS, to protect the inline crypto material
26 // exchange. 27 // exchange.
27 // SEC_DISABLED: No crypto in outgoing offer, ignore any supplied crypto. 28 // SEC_DISABLED: No crypto in outgoing offer, ignore any supplied crypto.
28 // SEC_ENABLED: Crypto in outgoing offer and answer (if supplied in offer). 29 // SEC_ENABLED: Crypto in outgoing offer and answer (if supplied in offer).
29 // SEC_REQUIRED: Crypto in outgoing offer and answer. Fail any offer with absent 30 // SEC_REQUIRED: Crypto in outgoing offer and answer. Fail any offer with absent
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 std::unique_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_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/testrelayserver.h ('k') | webrtc/p2p/client/basicportallocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698