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

Unified Diff: remoting/protocol/libjingle_transport_factory.cc

Issue 1177983009: Move remoting-specific adapters from jingle/glue to remoting/protocol (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/channel_socket_adapter_unittest.cc ('k') | remoting/protocol/pseudotcp_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/libjingle_transport_factory.cc
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index 10124bd0d1f95a368e1190edfc670b82bc18ced1..a1f18301959d80695706922258e8e448246e0249 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -11,9 +11,9 @@
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "base/timer/timer.h"
-#include "jingle/glue/channel_socket_adapter.h"
#include "jingle/glue/utils.h"
#include "net/base/net_errors.h"
+#include "remoting/protocol/channel_socket_adapter.h"
#include "remoting/protocol/network_settings.h"
#include "remoting/signaling/jingle_info_request.h"
#include "third_party/webrtc/base/network.h"
@@ -87,8 +87,8 @@ class LibjingleTransport
const cricket::Candidate& candidate);
void OnWritableState(cricket::TransportChannel* channel);
- // Callback for jingle_glue::TransportChannelSocketAdapter to notify when the
- // socket is destroyed.
+ // Callback for TransportChannelSocketAdapter to notify when the socket is
+ // destroyed.
void OnChannelDestroyed();
void NotifyRouteChanged();
@@ -237,8 +237,8 @@ void LibjingleTransport::DoStart() {
void LibjingleTransport::NotifyConnected() {
// Create net::Socket adapter for the P2PTransportChannel.
- scoped_ptr<jingle_glue::TransportChannelSocketAdapter> socket(
- new jingle_glue::TransportChannelSocketAdapter(channel_.get()));
+ scoped_ptr<TransportChannelSocketAdapter> socket(
+ new TransportChannelSocketAdapter(channel_.get()));
socket->SetOnDestroyedCallback(base::Bind(
&LibjingleTransport::OnChannelDestroyed, base::Unretained(this)));
base::ResetAndReturn(&callback_).Run(socket.Pass());
« no previous file with comments | « remoting/protocol/channel_socket_adapter_unittest.cc ('k') | remoting/protocol/pseudotcp_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698