Chromium Code Reviews| 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..b239937ad4ed9f8c4953eae10b03056fd5aab226 100644 |
| --- a/remoting/host/simple_host_process.cc |
| +++ b/remoting/host/simple_host_process.cc |
| @@ -42,6 +42,7 @@ |
| #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/register_support_host_request.h" |
| @@ -232,8 +233,13 @@ class SimpleHost : public HeartbeatSender::Listener { |
| desktop_environment_ = DesktopEnvironment::Create(&context_); |
| } |
| + scoped_ptr<SessionManagerFactory> session_manager_factory( |
| + new JingleSessionManagerFactory()); |
| + |
| host_ = new ChromotingHost(&context_, signal_strategy_.get(), |
| - desktop_environment_.get(), network_settings_); |
| + desktop_environment_.get(), |
| + session_manager_factory.Pass(), |
|
Wez
2012/06/11 22:17:06
Pass the new object directly here?
simonmorris
2012/06/11 23:08:59
Done.
|
| + network_settings_); |
| ServerLogEntry::Mode mode = |
| is_it2me_ ? ServerLogEntry::IT2ME : ServerLogEntry::ME2ME; |