Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(551)

Unified Diff: remoting/protocol/pseudotcp_channel_factory.cc

Issue 1197853003: Add P2PDatagramSocket and P2PStreamSocket interfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « remoting/protocol/pseudotcp_channel_factory.h ('k') | remoting/protocol/secure_channel_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/pseudotcp_channel_factory.cc
diff --git a/remoting/protocol/pseudotcp_channel_factory.cc b/remoting/protocol/pseudotcp_channel_factory.cc
index 1fc9ca831c149b1aee617236e0eae76fe5d42fdf..432a2a92967261882dd66c7f48b2b275edc4f07c 100644
--- a/remoting/protocol/pseudotcp_channel_factory.cc
+++ b/remoting/protocol/pseudotcp_channel_factory.cc
@@ -6,9 +6,9 @@
#include "base/bind.h"
#include "net/base/net_errors.h"
-#include "net/socket/stream_socket.h"
#include "remoting/base/constants.h"
#include "remoting/protocol/datagram_channel_factory.h"
+#include "remoting/protocol/p2p_datagram_socket.h"
#include "remoting/protocol/pseudotcp_adapter.h"
namespace remoting {
@@ -59,7 +59,7 @@ void PseudoTcpChannelFactory::CancelChannelCreation(const std::string& name) {
void PseudoTcpChannelFactory::OnDatagramChannelCreated(
const std::string& name,
const ChannelCreatedCallback& callback,
- scoped_ptr<net::Socket> datagram_socket) {
+ scoped_ptr<P2PDatagramSocket> datagram_socket) {
PseudoTcpAdapter* adapter = new PseudoTcpAdapter(datagram_socket.Pass());
pending_sockets_[name] = adapter;
@@ -86,7 +86,7 @@ void PseudoTcpChannelFactory::OnPseudoTcpConnected(
int result) {
PendingSocketsMap::iterator it = pending_sockets_.find(name);
DCHECK(it != pending_sockets_.end());
- scoped_ptr<net::StreamSocket> socket(it->second);
+ scoped_ptr<P2PStreamSocket> socket(it->second);
pending_sockets_.erase(it);
if (result != net::OK)
« no previous file with comments | « remoting/protocol/pseudotcp_channel_factory.h ('k') | remoting/protocol/secure_channel_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698