remoting/protocol/channel_socket_adapter.h - 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_socket_adapter.h

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/channel_multiplexer.cc ('K') | « remoting/protocol/channel_multiplexer_unittest.cc ('k') | remoting/protocol/connection_tester.h » ('j') | remoting/protocol/fake_stream_socket.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: remoting/protocol/channel_socket_adapter.h

diff --git a/remoting/protocol/channel_socket_adapter.h b/remoting/protocol/channel_socket_adapter.h

index 9af85e2b96bd6f3992e26da1f6a9020b8f789527..8d455d26409d571e162a793b924393738db46cc6 100644

--- a/remoting/protocol/channel_socket_adapter.h

+++ b/remoting/protocol/channel_socket_adapter.h

@@ -8,7 +8,7 @@

#include "base/callback_forward.h"

#include "base/compiler_specific.h"

#include "base/threading/thread_checker.h"

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

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

#include "third_party/webrtc/base/asyncpacketsocket.h"

#include "third_party/webrtc/base/sigslot.h"

#include "third_party/webrtc/base/socketaddress.h"

@@ -20,10 +20,10 @@ class TransportChannel;

namespace remoting {

namespace protocol {

-// TransportChannelSocketAdapter implements net::Socket interface on

+// TransportChannelSocketAdapter implements P2PDatagramSocket interface on

// top of libjingle's TransportChannel. It is used by LibjingleTransportFactory

-// to provide net::Socket interface for channels.

-class TransportChannelSocketAdapter : public net::Socket,

+// to provide P2PDatagramSocket interface for channels.

+class TransportChannelSocketAdapter : public P2PDatagramSocket,

public sigslot::has_slots<> {

public:

// Doesn't take ownership of the |channel|. The |channel| must outlive this