content/renderer/media/mock_media_stream_dependency_factory.h - Issue 12207107: Update libjingle 273:277.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/mock_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:

Index: content/renderer/media/mock_media_stream_dependency_factory.h

===================================================================

--- content/renderer/media/mock_media_stream_dependency_factory.h (revision 181693)

+++ content/renderer/media/mock_media_stream_dependency_factory.h (working copy)

@@ -23,6 +23,7 @@

virtual cricket::VideoCapturer* GetVideoCapturer() OVERRIDE;

virtual void AddSink(cricket::VideoRenderer* output) OVERRIDE;

virtual void RemoveSink(cricket::VideoRenderer* output) OVERRIDE;

+ virtual const cricket::VideoOptions* options() const OVERRIDE;

// Changes the state of the source to live and notifies the observer.

void SetLive();

@@ -154,7 +155,8 @@

webrtc::AudioSourceInterface* source) OVERRIDE;

virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(

const std::string& type,

- const std::string& sdp) OVERRIDE;

+ const std::string& sdp,

+ webrtc::SdpParseError* error) OVERRIDE;

virtual webrtc::IceCandidateInterface* CreateIceCandidate(

const std::string& sdp_mid,

int sdp_mline_index,