remoting/protocol/channel_dispatcher_base.cc - Issue 1197853003: Add P2PDatagramSocket and P2PStreamSocket interfaces.

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: remoting/protocol/channel_dispatcher_base.cc

Issue 1197853003: Add P2PDatagramSocket and P2PStreamSocket interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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

« remoting/protocol/authenticator_test_base.cc ('K') | « remoting/protocol/channel_dispatcher_base.h ('k') | remoting/protocol/channel_multiplexer.h » ('j') | remoting/protocol/channel_multiplexer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: remoting/protocol/channel_dispatcher_base.cc

diff --git a/remoting/protocol/channel_dispatcher_base.cc b/remoting/protocol/channel_dispatcher_base.cc

index 575b1e57913206218e774cd82976e21ce29f2745..24345dc73dcc35ade1d86c2a550b6bb4e8621110 100644

--- a/remoting/protocol/channel_dispatcher_base.cc

+++ b/remoting/protocol/channel_dispatcher_base.cc

@@ -5,7 +5,7 @@

#include "remoting/protocol/channel_dispatcher_base.h"

#include "base/bind.h"

-#include "net/socket/stream_socket.h"

+#include "remoting/protocol/p2p_socket.h"

#include "remoting/protocol/session.h"

#include "remoting/protocol/session_config.h"

#include "remoting/protocol/stream_channel_factory.h"

@@ -49,7 +49,7 @@ void ChannelDispatcherBase::Init(Session* session,

}

void ChannelDispatcherBase::OnChannelReady(

- scoped_ptr<net::StreamSocket> socket) {

+ scoped_ptr<P2PStreamSocket> socket) {

if (!socket.get()) {

event_handler_->OnChannelError(this, CHANNEL_CONNECTION_ERROR);

return;