summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorhclam@google.com <hclam@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-09 23:09:11 +0000
committerhclam@google.com <hclam@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-09 23:09:11 +0000
commitc9c2c2b9fa718a3580278af2b2349139f68d37a5 (patch)
treee702069ba31a7fa4b5b5230482566b606561d11a /remoting
parent980bc2230826afde1159a7d8e02baa0095edb151 (diff)
downloadchromium_src-c9c2c2b9fa718a3580278af2b2349139f68d37a5.zip
chromium_src-c9c2c2b9fa718a3580278af2b2349139f68d37a5.tar.gz
chromium_src-c9c2c2b9fa718a3580278af2b2349139f68d37a5.tar.bz2
Inject custom NetworkManager to JingelClient
This will enable using p2papi in the renderer by chromoting client. BUG=None TEST=None Review URL: http://codereview.chromium.org/6660005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/protocol/connection_to_host.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index d2a4096..59e4001 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -67,6 +67,7 @@ void ConnectionToHost::Connect(const std::string& username,
kChromotingTokenServiceName));
jingle_client_ =
new JingleClient(thread_, signal_strategy_.get(),
+ network_manager_.release(), socket_factory_.release(),
port_allocator_session_factory_.release(), this);
jingle_client_->Init();
@@ -91,6 +92,7 @@ void ConnectionToHost::ConnectSandboxed(scoped_refptr<XmppProxy> xmpp_proxy,
signal_strategy_.reset(strategy);
jingle_client_ =
new JingleClient(thread_, signal_strategy_.get(),
+ network_manager_.release(), socket_factory_.release(),
port_allocator_session_factory_.release(), this);
jingle_client_->Init();