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

Side by Side Diff: webrtc/pc/srtpfilter.h

Issue 3011943002: Move optional.h to webrtc/api/ (Closed)
Patch Set: Created 3 years, 3 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/pc/rtcstatscollector.h ('k') | webrtc/pc/webrtcsession.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 2009 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2009 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_PC_SRTPFILTER_H_ 11 #ifndef WEBRTC_PC_SRTPFILTER_H_
12 #define WEBRTC_PC_SRTPFILTER_H_ 12 #define WEBRTC_PC_SRTPFILTER_H_
13 13
14 #include <list> 14 #include <list>
15 #include <map> 15 #include <map>
16 #include <memory> 16 #include <memory>
17 #include <string> 17 #include <string>
18 #include <vector> 18 #include <vector>
19 19
20 #include "webrtc/api/optional.h"
20 #include "webrtc/media/base/cryptoparams.h" 21 #include "webrtc/media/base/cryptoparams.h"
21 #include "webrtc/p2p/base/sessiondescription.h" 22 #include "webrtc/p2p/base/sessiondescription.h"
22 #include "webrtc/rtc_base/basictypes.h" 23 #include "webrtc/rtc_base/basictypes.h"
23 #include "webrtc/rtc_base/buffer.h" 24 #include "webrtc/rtc_base/buffer.h"
24 #include "webrtc/rtc_base/constructormagic.h" 25 #include "webrtc/rtc_base/constructormagic.h"
25 #include "webrtc/rtc_base/criticalsection.h" 26 #include "webrtc/rtc_base/criticalsection.h"
26 #include "webrtc/rtc_base/optional.h"
27 #include "webrtc/rtc_base/sslstreamadapter.h" 27 #include "webrtc/rtc_base/sslstreamadapter.h"
28 #include "webrtc/rtc_base/thread_checker.h" 28 #include "webrtc/rtc_base/thread_checker.h"
29 29
30 // Forward declaration to avoid pulling in libsrtp headers here 30 // Forward declaration to avoid pulling in libsrtp headers here
31 struct srtp_event_data_t; 31 struct srtp_event_data_t;
32 struct srtp_ctx_t_; 32 struct srtp_ctx_t_;
33 33
34 namespace cricket { 34 namespace cricket {
35 35
36 void ShutdownSrtp(); 36 void ShutdownSrtp();
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 CryptoParams applied_recv_params_; 134 CryptoParams applied_recv_params_;
135 rtc::Optional<int> send_cipher_suite_; 135 rtc::Optional<int> send_cipher_suite_;
136 rtc::Optional<int> recv_cipher_suite_; 136 rtc::Optional<int> recv_cipher_suite_;
137 rtc::Buffer send_key_; 137 rtc::Buffer send_key_;
138 rtc::Buffer recv_key_; 138 rtc::Buffer recv_key_;
139 }; 139 };
140 140
141 } // namespace cricket 141 } // namespace cricket
142 142
143 #endif // WEBRTC_PC_SRTPFILTER_H_ 143 #endif // WEBRTC_PC_SRTPFILTER_H_
OLDNEW
« no previous file with comments | « webrtc/pc/rtcstatscollector.h ('k') | webrtc/pc/webrtcsession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698