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

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: Fix remoting.gyp. 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/simple_host_process.cc
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 58e3c5d294548b21c8c27fbbe6ed13d318a6d200..89e0abb6afb50b931514430be68a9be29f3a442d 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -42,8 +42,10 @@
#include "remoting/host/host_key_pair.h"
#include "remoting/host/host_secret.h"
#include "remoting/host/it2me_host_user_interface.h"
+#include "remoting/host/jingle_session_manager_factory.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/signaling_connector.h"
#include "remoting/jingle_glue/xmpp_signal_strategy.h"
@@ -232,8 +234,13 @@ 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(),
Sergey Ulanov 2012/06/13 01:57:19 here too.
simonmorris 2012/06/13 16:26:33 Done.
+ JingleSessionManagerFactory::CreateSessionManager(
+ network_settings_,
+ context_.url_request_context_getter()));
ServerLogEntry::Mode mode =
is_it2me_ ? ServerLogEntry::IT2ME : ServerLogEntry::ME2ME;

Powered by Google App Engine
This is Rietveld 408576698