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

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

Issue 12207107: Update libjingle 273:277. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « DEPS ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_dependency_factory.h
===================================================================
--- content/renderer/media/media_stream_dependency_factory.h (revision 181693)
+++ content/renderer/media/media_stream_dependency_factory.h (working copy)
@@ -93,16 +93,18 @@
// PeerConnection object.
// The PeerConnection object is owned by PeerConnectionHandler.
virtual scoped_refptr<webrtc::PeerConnectionInterface>
- CreatePeerConnection(const webrtc::JsepInterface::IceServers& ice_servers,
- const webrtc::MediaConstraintsInterface* constraints,
- WebKit::WebFrame* web_frame,
- webrtc::PeerConnectionObserver* observer);
+ CreatePeerConnection(
+ const webrtc::PeerConnectionInterface::IceServers& ice_servers,
+ const webrtc::MediaConstraintsInterface* constraints,
+ WebKit::WebFrame* web_frame,
+ webrtc::PeerConnectionObserver* observer);
// Creates a libjingle representation of a Session description. Used by a
// RTCPeerConnectionHandler instance.
virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(
const std::string& type,
- const std::string& sdp);
+ const std::string& sdp,
+ webrtc::SdpParseError* error);
// Creates a libjingle representation of an ice candidate.
virtual webrtc::IceCandidateInterface* CreateIceCandidate(
« no previous file with comments | « DEPS ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698