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

Side by Side Diff: webrtc/pc/webrtcsession.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/srtpfilter.h ('k') | webrtc/rtc_base/BUILD.gn » ('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_PC_WEBRTCSESSION_H_ 11 #ifndef WEBRTC_PC_WEBRTCSESSION_H_
12 #define WEBRTC_PC_WEBRTCSESSION_H_ 12 #define WEBRTC_PC_WEBRTCSESSION_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <set> 15 #include <set>
16 #include <string> 16 #include <string>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/api/optional.h"
19 #include "webrtc/api/peerconnectioninterface.h" 20 #include "webrtc/api/peerconnectioninterface.h"
20 #include "webrtc/api/statstypes.h" 21 #include "webrtc/api/statstypes.h"
21 #include "webrtc/call/call.h" 22 #include "webrtc/call/call.h"
22 #include "webrtc/p2p/base/candidate.h" 23 #include "webrtc/p2p/base/candidate.h"
23 #include "webrtc/p2p/base/transportcontroller.h" 24 #include "webrtc/p2p/base/transportcontroller.h"
24 #include "webrtc/pc/datachannel.h" 25 #include "webrtc/pc/datachannel.h"
25 #include "webrtc/pc/mediasession.h" 26 #include "webrtc/pc/mediasession.h"
26 #include "webrtc/rtc_base/constructormagic.h" 27 #include "webrtc/rtc_base/constructormagic.h"
27 #include "webrtc/rtc_base/optional.h"
28 #include "webrtc/rtc_base/sigslot.h" 28 #include "webrtc/rtc_base/sigslot.h"
29 #include "webrtc/rtc_base/sslidentity.h" 29 #include "webrtc/rtc_base/sslidentity.h"
30 #include "webrtc/rtc_base/thread.h" 30 #include "webrtc/rtc_base/thread.h"
31 31
32 #ifdef HAVE_QUIC 32 #ifdef HAVE_QUIC
33 #include "webrtc/pc/quicdatatransport.h" 33 #include "webrtc/pc/quicdatatransport.h"
34 #endif // HAVE_QUIC 34 #endif // HAVE_QUIC
35 35
36 namespace cricket { 36 namespace cricket {
37 37
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 667
668 #ifdef HAVE_QUIC 668 #ifdef HAVE_QUIC
669 std::unique_ptr<QuicDataTransport> quic_data_transport_; 669 std::unique_ptr<QuicDataTransport> quic_data_transport_;
670 #endif // HAVE_QUIC 670 #endif // HAVE_QUIC
671 671
672 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 672 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
673 }; 673 };
674 } // namespace webrtc 674 } // namespace webrtc
675 675
676 #endif // WEBRTC_PC_WEBRTCSESSION_H_ 676 #endif // WEBRTC_PC_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « webrtc/pc/srtpfilter.h ('k') | webrtc/rtc_base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698