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

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

Issue 1921653002: Enable -Winconsistent-missing-override flag. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. 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
OLDNEW
1 /* 1 /*
2 * Copyright 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2011 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
(...skipping 16 matching lines...) Expand all
27 class BasicPacketSocketFactory; 27 class BasicPacketSocketFactory;
28 } 28 }
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 typedef rtc::RefCountedObject<DtlsIdentityStoreImpl> 32 typedef rtc::RefCountedObject<DtlsIdentityStoreImpl>
33 RefCountedDtlsIdentityStore; 33 RefCountedDtlsIdentityStore;
34 34
35 class PeerConnectionFactory : public PeerConnectionFactoryInterface { 35 class PeerConnectionFactory : public PeerConnectionFactoryInterface {
36 public: 36 public:
37 virtual void SetOptions(const Options& options) { 37 void SetOptions(const Options& options) override {
38 options_ = options; 38 options_ = options;
39 } 39 }
40 40
41 // Deprecated, use version without constraints. 41 // Deprecated, use version without constraints.
42 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection( 42 rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
43 const PeerConnectionInterface::RTCConfiguration& configuration, 43 const PeerConnectionInterface::RTCConfiguration& configuration,
44 const MediaConstraintsInterface* constraints, 44 const MediaConstraintsInterface* constraints,
45 rtc::scoped_ptr<cricket::PortAllocator> allocator, 45 rtc::scoped_ptr<cricket::PortAllocator> allocator,
46 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 46 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
47 PeerConnectionObserver* observer) override; 47 PeerConnectionObserver* observer) override;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 video_decoder_factory_; 123 video_decoder_factory_;
124 rtc::scoped_ptr<rtc::BasicNetworkManager> default_network_manager_; 124 rtc::scoped_ptr<rtc::BasicNetworkManager> default_network_manager_;
125 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_; 125 rtc::scoped_ptr<rtc::BasicPacketSocketFactory> default_socket_factory_;
126 126
127 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 127 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_;
128 }; 128 };
129 129
130 } // namespace webrtc 130 } // namespace webrtc
131 131
132 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_ 132 #endif // WEBRTC_API_PEERCONNECTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698