talk/app/webrtc/peerconnection.h - Issue 1397973002: Merging BaseSession code into WebRtcSession.

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/peerconnection.h

Issue 1397973002: Merging BaseSession code into WebRtcSession. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Merging with master (MediaStreamSignaling removal affected WebRtcSession). Created 5 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:

Index: talk/app/webrtc/peerconnection.h

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

index 0c048988e13d5de30feb4dcaf593d9386f1937e7..6a664978593badcf5c89fca0e5a47c441fc70992 100644

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

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

@@ -209,8 +209,7 @@ class PeerConnection : public PeerConnectionInterface,

void OnIceConnectionReceivingChange(bool receiving) override;

// Signals from WebRtcSession.

- void OnSessionStateChange(cricket::BaseSession* session,

- cricket::BaseSession::State state);

+ void OnSessionStateChange(WebRtcSession* session, WebRtcSession::State state);

void ChangeSignalingState(SignalingState signaling_state);

rtc::Thread* signaling_thread() const {

« no previous file with comments | « no previous file | talk/app/webrtc/peerconnection.cc » ('j') | no next file with comments »