remoting/host/remoting_me2me_host.cc - Issue 10538091: [Chromoting] Make ChromotingHost's dependency on libjingle injected, instead of hard-coded.

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/host/remoting_me2me_host.cc

Issue 10538091: [Chromoting] Make ChromotingHost's dependency on libjingle injected, instead of hard-coded. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Patch for Windows. Created 8 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

Index: remoting/host/remoting_me2me_host.cc

diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc

index bb87fb557a53e0a96a2bb92fca442f6a29e8743b..04087abff57e35c05d9fcde886a7ca520e79a584 100644

--- a/remoting/host/remoting_me2me_host.cc

+++ b/remoting/host/remoting_me2me_host.cc

@@ -38,7 +38,9 @@

#include "remoting/host/host_user_interface.h"

#include "remoting/host/json_host_config.h"

#include "remoting/host/log_to_server.h"

+#include "remoting/host/network_settings.h"

#include "remoting/host/policy_hack/nat_policy.h"

+#include "remoting/host/session_manager_factory.h"

#include "remoting/host/signaling_connector.h"

#include "remoting/jingle_glue/xmpp_signal_strategy.h"

#include "remoting/protocol/me2me_host_authenticator_factory.h"

@@ -385,7 +387,8 @@ class HostProcess

host_ = new ChromotingHost(

context_.get(), signal_strategy_.get(), desktop_environment_.get(),

- network_settings);

+ CreateHostSessionManager(network_settings,

+ context_->url_request_context_getter()));

heartbeat_sender_.reset(new HeartbeatSender(

this, host_id_, signal_strategy_.get(), &key_pair_));

« no previous file with comments | « remoting/host/plugin/host_script_object.cc ('k') | remoting/host/session_manager_factory.h » ('j') | no next file with comments »