talk/app/webrtc/peerconnectionproxy.h - Issue 1361273002: Reland of Adding PeerConnectionInterface::SetConfiguration method.

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: talk/app/webrtc/peerconnectionproxy.h

Issue 1361273002: Reland of Adding PeerConnectionInterface::SetConfiguration method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fixing patch conflict. 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

Index: talk/app/webrtc/peerconnectionproxy.h

diff --git a/talk/app/webrtc/peerconnectionproxy.h b/talk/app/webrtc/peerconnectionproxy.h

index d9af8d9ab6443a5541eaa802cbf80bfa996c9f31..d207fbbdd87df2bb9e8b1c6fedb24fdfac72cbe5 100644

--- a/talk/app/webrtc/peerconnectionproxy.h

+++ b/talk/app/webrtc/peerconnectionproxy.h

@@ -62,8 +62,9 @@ BEGIN_PROXY_MAP(PeerConnection)

SessionDescriptionInterface*)

PROXY_METHOD2(void, SetRemoteDescription, SetSessionDescriptionObserver*,

SessionDescriptionInterface*)

- PROXY_METHOD2(bool, UpdateIce, const IceServers&,

- const MediaConstraintsInterface*)

+ PROXY_METHOD1(bool,

+ SetConfiguration,

+ const PeerConnectionInterface::RTCConfiguration&);

PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)

PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*)

PROXY_METHOD0(SignalingState, signaling_state)

« no previous file with comments | « talk/app/webrtc/peerconnectioninterface.h ('k') | no next file » | no next file with comments »