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

Side by Side Diff: webrtc/examples/peerconnection/client/conductor.h

Issue 2748253003: Pass ownership of candidate to PeerConnection::OnIceCandidate (Closed)
Patch Set: Remove old "OnIceCandidate" and "using" workarounds. Created 3 years, 9 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 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
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override; 70 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override;
71 void OnRemoveStream( 71 void OnRemoveStream(
72 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override; 72 rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override;
73 void OnDataChannel( 73 void OnDataChannel(
74 rtc::scoped_refptr<webrtc::DataChannelInterface> channel) override {} 74 rtc::scoped_refptr<webrtc::DataChannelInterface> channel) override {}
75 void OnRenegotiationNeeded() override {} 75 void OnRenegotiationNeeded() override {}
76 void OnIceConnectionChange( 76 void OnIceConnectionChange(
77 webrtc::PeerConnectionInterface::IceConnectionState new_state) override{}; 77 webrtc::PeerConnectionInterface::IceConnectionState new_state) override{};
78 void OnIceGatheringChange( 78 void OnIceGatheringChange(
79 webrtc::PeerConnectionInterface::IceGatheringState new_state) override{}; 79 webrtc::PeerConnectionInterface::IceGatheringState new_state) override{};
80 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override; 80 void OnIceCandidate(
81 rtc::scoped_refptr<webrtc::IceCandidateInterface> candidate) override;
81 void OnIceConnectionReceivingChange(bool receiving) override {} 82 void OnIceConnectionReceivingChange(bool receiving) override {}
82 83
83 // 84 //
84 // PeerConnectionClientObserver implementation. 85 // PeerConnectionClientObserver implementation.
85 // 86 //
86 87
87 void OnSignedIn() override; 88 void OnSignedIn() override;
88 89
89 void OnDisconnected() override; 90 void OnDisconnected() override;
90 91
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 peer_connection_factory_; 128 peer_connection_factory_;
128 PeerConnectionClient* client_; 129 PeerConnectionClient* client_;
129 MainWindow* main_wnd_; 130 MainWindow* main_wnd_;
130 std::deque<std::string*> pending_messages_; 131 std::deque<std::string*> pending_messages_;
131 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> > 132 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> >
132 active_streams_; 133 active_streams_;
133 std::string server_; 134 std::string server_;
134 }; 135 };
135 136
136 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 137 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698