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

Unified Diff: content/renderer/media/rtc_peer_connection_handler.h

Issue 12210111: Hookup new ice state callbacks OnIceConnectionChange and OnIceGatheringChange from PeerConnectionOb… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with latest code base. Created 7 years, 10 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
Index: content/renderer/media/rtc_peer_connection_handler.h
diff --git a/content/renderer/media/rtc_peer_connection_handler.h b/content/renderer/media/rtc_peer_connection_handler.h
index 7aa5598871a4f9fe6a09d4a7ffd59539220ab4a7..dbec0bec9a67c9415274aadc3d34f4f55caf0d9c 100644
--- a/content/renderer/media/rtc_peer_connection_handler.h
+++ b/content/renderer/media/rtc_peer_connection_handler.h
@@ -134,12 +134,18 @@ class CONTENT_EXPORT RTCPeerConnectionHandler
// webrtc::PeerConnectionObserver implementation
virtual void OnError() OVERRIDE;
- virtual void OnStateChange(StateType state_changed) OVERRIDE;
+ // Triggered when the SignalingState changed.
+ virtual void OnSignalingChange(
+ webrtc::PeerConnectionInterface::SignalingState new_state) OVERRIDE;
virtual void OnAddStream(webrtc::MediaStreamInterface* stream) OVERRIDE;
virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) OVERRIDE;
virtual void OnIceCandidate(
const webrtc::IceCandidateInterface* candidate) OVERRIDE;
- virtual void OnIceComplete() OVERRIDE;
+ virtual void OnIceConnectionChange(
+ webrtc::PeerConnectionInterface::IceConnectionState new_state) OVERRIDE;
+ virtual void OnIceGatheringChange(
+ webrtc::PeerConnectionInterface::IceGatheringState new_state) OVERRIDE;
+
virtual void OnDataChannel(
webrtc::DataChannelInterface* data_channel) OVERRIDE;
virtual void OnRenegotiationNeeded() OVERRIDE;
@@ -153,6 +159,7 @@ class CONTENT_EXPORT RTCPeerConnectionHandler
webrtc::MediaStreamTrackInterface* track);
PeerConnectionTracker* peer_connection_tracker();
+
private:
webrtc::SessionDescriptionInterface* CreateNativeSessionDescription(
const WebKit::WebRTCSessionDescription& description,

Powered by Google App Engine
This is Rietveld 408576698