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

Unified Diff: remoting/host/simple_host_process.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
« no previous file with comments | « remoting/host/session_manager_factory.cc ('k') | remoting/protocol/protocol_mock_objects.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/simple_host_process.cc
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index b11fc3d92967d8514ad9ddf07c7df0b13df8655b..7635e544439a9d8daa5315e56a0c0fdbdf7f71ef 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -45,7 +45,9 @@
#include "remoting/host/it2me_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/register_support_host_request.h"
+#include "remoting/host/session_manager_factory.h"
#include "remoting/host/signaling_connector.h"
#include "remoting/jingle_glue/xmpp_signal_strategy.h"
#include "remoting/proto/video.pb.h"
@@ -232,8 +234,10 @@ class SimpleHost : public HeartbeatSender::Listener {
desktop_environment_ = DesktopEnvironment::Create(&context_);
}
- host_ = new ChromotingHost(&context_, signal_strategy_.get(),
- desktop_environment_.get(), network_settings_);
+ host_ = new ChromotingHost(
+ &context_, signal_strategy_.get(), desktop_environment_.get(),
+ CreateHostSessionManager(network_settings_,
+ context_.url_request_context_getter()));
ServerLogEntry::Mode mode =
is_it2me_ ? ServerLogEntry::IT2ME : ServerLogEntry::ME2ME;
« no previous file with comments | « remoting/host/session_manager_factory.cc ('k') | remoting/protocol/protocol_mock_objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698