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

Unified Diff: talk/app/webrtc/peerconnection.h

Issue 1317353005: Adding PeerConnectionInterface::SetConfiguration method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Deleting some unused code, and adding TODO for pending deletion Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/app/webrtc/objc/public/RTCPeerConnection.h ('k') | talk/app/webrtc/peerconnection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/peerconnection.h
diff --git a/talk/app/webrtc/peerconnection.h b/talk/app/webrtc/peerconnection.h
index 2160afb241c392084be3f22bea0669a1aa62769e..c9c524b9883965f931b48d7ec4bd570d7c59e4e3 100644
--- a/talk/app/webrtc/peerconnection.h
+++ b/talk/app/webrtc/peerconnection.h
@@ -64,59 +64,59 @@ class PeerConnection : public PeerConnectionInterface,
PortAllocatorFactoryInterface* allocator_factory,
rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
PeerConnectionObserver* observer);
- virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams();
- virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams();
- virtual bool AddStream(MediaStreamInterface* local_stream);
- virtual void RemoveStream(MediaStreamInterface* local_stream);
+ rtc::scoped_refptr<StreamCollectionInterface> local_streams() override;
+ rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override;
+ bool AddStream(MediaStreamInterface* local_stream) override;
+ void RemoveStream(MediaStreamInterface* local_stream) override;
- virtual rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender(
- AudioTrackInterface* track);
+ rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender(
+ AudioTrackInterface* track) override;
- virtual rtc::scoped_refptr<DataChannelInterface> CreateDataChannel(
+ rtc::scoped_refptr<DataChannelInterface> CreateDataChannel(
const std::string& label,
- const DataChannelInit* config);
- virtual bool GetStats(StatsObserver* observer,
- webrtc::MediaStreamTrackInterface* track,
- StatsOutputLevel level);
+ const DataChannelInit* config) override;
+ bool GetStats(StatsObserver* observer,
+ webrtc::MediaStreamTrackInterface* track,
+ StatsOutputLevel level) override;
- virtual SignalingState signaling_state();
+ SignalingState signaling_state() override;
// TODO(bemasc): Remove ice_state() when callers are removed.
- virtual IceState ice_state();
- virtual IceConnectionState ice_connection_state();
- virtual IceGatheringState ice_gathering_state();
+ IceState ice_state() override;
+ IceConnectionState ice_connection_state() override;
+ IceGatheringState ice_gathering_state() override;
- virtual const SessionDescriptionInterface* local_description() const;
- virtual const SessionDescriptionInterface* remote_description() const;
+ const SessionDescriptionInterface* local_description() const override;
+ const SessionDescriptionInterface* remote_description() const override;
// JSEP01
- virtual void CreateOffer(CreateSessionDescriptionObserver* observer,
- const MediaConstraintsInterface* constraints);
- virtual void CreateOffer(CreateSessionDescriptionObserver* observer,
- const RTCOfferAnswerOptions& options);
- virtual void CreateAnswer(CreateSessionDescriptionObserver* observer,
- const MediaConstraintsInterface* constraints);
- virtual void SetLocalDescription(SetSessionDescriptionObserver* observer,
- SessionDescriptionInterface* desc);
- virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer,
- SessionDescriptionInterface* desc);
- // TODO(mallinath) : Deprecated version, remove after all clients are updated.
- virtual bool UpdateIce(const IceServers& configuration,
- const MediaConstraintsInterface* constraints);
- virtual bool UpdateIce(
- const PeerConnectionInterface::RTCConfiguration& config);
- virtual bool AddIceCandidate(const IceCandidateInterface* candidate);
-
- virtual void RegisterUMAObserver(UMAObserver* observer);
-
- virtual void Close();
+ void CreateOffer(CreateSessionDescriptionObserver* observer,
+ const MediaConstraintsInterface* constraints) override;
+ void CreateOffer(CreateSessionDescriptionObserver* observer,
+ const RTCOfferAnswerOptions& options) override;
+ void CreateAnswer(CreateSessionDescriptionObserver* observer,
+ const MediaConstraintsInterface* constraints) override;
+ void SetLocalDescription(SetSessionDescriptionObserver* observer,
+ SessionDescriptionInterface* desc) override;
+ void SetRemoteDescription(SetSessionDescriptionObserver* observer,
+ SessionDescriptionInterface* desc) override;
+ // TODO(deadbeef) : Deprecated version, remove after all clients are updated.
+ bool UpdateIce(const IceServers& configuration,
+ const MediaConstraintsInterface* constraints) override;
+ bool SetConfiguration(
+ const PeerConnectionInterface::RTCConfiguration& config) override;
+ bool AddIceCandidate(const IceCandidateInterface* candidate) override;
+
+ void RegisterUMAObserver(UMAObserver* observer) override;
+
+ void Close() override;
protected:
- virtual ~PeerConnection();
+ ~PeerConnection() override;
private:
// Implements MessageHandler.
- virtual void OnMessage(rtc::Message* msg);
+ void OnMessage(rtc::Message* msg) override;
// Implements MediaStreamSignalingObserver.
void OnAddRemoteStream(MediaStreamInterface* stream) override;
« no previous file with comments | « talk/app/webrtc/objc/public/RTCPeerConnection.h ('k') | talk/app/webrtc/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698