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

Side by Side Diff: webrtc/api/peerconnection.h

Issue 1942823002: Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix additional scoped_ptr uses that had been added 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/api/mediastreamprovider.h ('k') | webrtc/api/peerconnectionfactory.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_API_PEERCONNECTION_H_ 11 #ifndef WEBRTC_API_PEERCONNECTION_H_
12 #define WEBRTC_API_PEERCONNECTION_H_ 12 #define WEBRTC_API_PEERCONNECTION_H_
13 13
14 #include <string> 14 #include <string>
15 #include <map> 15 #include <map>
16 #include <memory> 16 #include <memory>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/api/dtlsidentitystore.h" 19 #include "webrtc/api/dtlsidentitystore.h"
20 #include "webrtc/api/peerconnectionfactory.h" 20 #include "webrtc/api/peerconnectionfactory.h"
21 #include "webrtc/api/peerconnectioninterface.h" 21 #include "webrtc/api/peerconnectioninterface.h"
22 #include "webrtc/api/rtpreceiverinterface.h" 22 #include "webrtc/api/rtpreceiverinterface.h"
23 #include "webrtc/api/rtpsenderinterface.h" 23 #include "webrtc/api/rtpsenderinterface.h"
24 #include "webrtc/api/statscollector.h" 24 #include "webrtc/api/statscollector.h"
25 #include "webrtc/api/streamcollection.h" 25 #include "webrtc/api/streamcollection.h"
26 #include "webrtc/api/webrtcsession.h" 26 #include "webrtc/api/webrtcsession.h"
27 #include "webrtc/base/scoped_ptr.h"
28 27
29 namespace webrtc { 28 namespace webrtc {
30 29
31 class MediaStreamObserver; 30 class MediaStreamObserver;
32 class VideoRtpReceiver; 31 class VideoRtpReceiver;
33 32
34 // Populates |session_options| from |rtc_options|, and returns true if options 33 // Populates |session_options| from |rtc_options|, and returns true if options
35 // are valid. 34 // are valid.
36 // |session_options|->transport_options map entries must exist in order for 35 // |session_options|->transport_options map entries must exist in order for
37 // them to be populated from |rtc_options|. 36 // them to be populated from |rtc_options|.
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 // because its destruction fires signals (such as VoiceChannelDestroyed) 400 // because its destruction fires signals (such as VoiceChannelDestroyed)
402 // which will trigger some final actions in PeerConnection... 401 // which will trigger some final actions in PeerConnection...
403 std::unique_ptr<WebRtcSession> session_; 402 std::unique_ptr<WebRtcSession> session_;
404 // ... But stats_ depends on session_ so it should be destroyed even earlier. 403 // ... But stats_ depends on session_ so it should be destroyed even earlier.
405 std::unique_ptr<StatsCollector> stats_; 404 std::unique_ptr<StatsCollector> stats_;
406 }; 405 };
407 406
408 } // namespace webrtc 407 } // namespace webrtc
409 408
410 #endif // WEBRTC_API_PEERCONNECTION_H_ 409 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « webrtc/api/mediastreamprovider.h ('k') | webrtc/api/peerconnectionfactory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698