third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.h - Issue 2415673003: Merge RTCConfiguration into WebRTCConfiguration

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: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.h

Issue 2415673003: Merge RTCConfiguration into WebRTCConfiguration (Closed)

Patch Set: headers, kConstants Created 4 years, 2 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 | « content/renderer/media/rtc_peer_connection_handler.cc ('k') | third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.h

diff --git a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.h b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.h

index ab12e1602e2aa595c800fb0dd2622e8fdf60968d..75c99b911bfa5df16015d213473137e6f59dea4b 100644

--- a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.h

+++ b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.h

@@ -49,7 +49,6 @@ namespace blink {

class ExceptionState;

class MediaStreamTrack;

class RTCAnswerOptions;

-class RTCConfiguration;

class RTCDTMFSender;

class RTCDataChannel;

class RTCIceCandidateInitOrRTCIceCandidate;

@@ -61,6 +60,7 @@ class RTCSessionDescriptionInit;

class RTCStatsCallback;

class ScriptState;

class VoidCallback;

+struct WebRTCConfiguration;

class RTCPeerConnection final : public EventTargetWithInlineData,

public WebRTCPeerConnectionHandlerClient,

@@ -213,7 +213,7 @@ class RTCPeerConnection final : public EventTargetWithInlineData,

};

RTCPeerConnection(ExecutionContext*,

- RTCConfiguration*,

+ const WebRTCConfiguration&,

WebMediaConstraints,

ExceptionState&);

void dispose();