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

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

Issue 1920043002: Replace scoped_ptr with unique_ptr in webrtc/base/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased 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/webrtcsession_unittest.cc ('k') | webrtc/api/webrtcsessiondescriptionfactory.cc » ('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 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2013 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_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ 11 #ifndef WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
12 #define WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ 12 #define WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
13 13
14 #include <memory>
15
14 #include "webrtc/api/dtlsidentitystore.h" 16 #include "webrtc/api/dtlsidentitystore.h"
15 #include "webrtc/api/peerconnectioninterface.h" 17 #include "webrtc/api/peerconnectioninterface.h"
16 #include "webrtc/base/messagehandler.h" 18 #include "webrtc/base/messagehandler.h"
17 #include "webrtc/base/rtccertificate.h" 19 #include "webrtc/base/rtccertificate.h"
18 #include "webrtc/p2p/base/transportdescriptionfactory.h" 20 #include "webrtc/p2p/base/transportdescriptionfactory.h"
19 #include "webrtc/pc/mediasession.h" 21 #include "webrtc/pc/mediasession.h"
20 22
21 namespace cricket { 23 namespace cricket {
22 class ChannelManager; 24 class ChannelManager;
23 class TransportDescriptionFactory; 25 class TransportDescriptionFactory;
24 } // namespace cricket 26 } // namespace cricket
25 27
26 namespace webrtc { 28 namespace webrtc {
27 class CreateSessionDescriptionObserver; 29 class CreateSessionDescriptionObserver;
28 class MediaConstraintsInterface; 30 class MediaConstraintsInterface;
29 class SessionDescriptionInterface; 31 class SessionDescriptionInterface;
30 class WebRtcSession; 32 class WebRtcSession;
31 33
32 // DTLS identity request callback class. 34 // DTLS identity request callback class.
33 class WebRtcIdentityRequestObserver : public DtlsIdentityRequestObserver, 35 class WebRtcIdentityRequestObserver : public DtlsIdentityRequestObserver,
34 public sigslot::has_slots<> { 36 public sigslot::has_slots<> {
35 public: 37 public:
36 // DtlsIdentityRequestObserver overrides. 38 // DtlsIdentityRequestObserver overrides.
37 void OnFailure(int error) override; 39 void OnFailure(int error) override;
38 void OnSuccess(const std::string& der_cert, 40 void OnSuccess(const std::string& der_cert,
39 const std::string& der_private_key) override; 41 const std::string& der_private_key) override;
40 void OnSuccess(rtc::scoped_ptr<rtc::SSLIdentity> identity) override; 42 void OnSuccess(std::unique_ptr<rtc::SSLIdentity> identity) override;
41 43
42 sigslot::signal1<int> SignalRequestFailed; 44 sigslot::signal1<int> SignalRequestFailed;
43 sigslot::signal1<const rtc::scoped_refptr<rtc::RTCCertificate>&> 45 sigslot::signal1<const rtc::scoped_refptr<rtc::RTCCertificate>&>
44 SignalCertificateReady; 46 SignalCertificateReady;
45 }; 47 };
46 48
47 struct CreateSessionDescriptionRequest { 49 struct CreateSessionDescriptionRequest {
48 enum Type { 50 enum Type {
49 kOffer, 51 kOffer,
50 kAnswer, 52 kAnswer,
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed. 169 // TODO(jiayl): remove the dependency on session once bug 2264 is fixed.
168 WebRtcSession* const session_; 170 WebRtcSession* const session_;
169 const std::string session_id_; 171 const std::string session_id_;
170 CertificateRequestState certificate_request_state_; 172 CertificateRequestState certificate_request_state_;
171 173
172 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory); 174 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSessionDescriptionFactory);
173 }; 175 };
174 } // namespace webrtc 176 } // namespace webrtc
175 177
176 #endif // WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_ 178 #endif // WEBRTC_API_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/api/webrtcsession_unittest.cc ('k') | webrtc/api/webrtcsessiondescriptionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698