Chromium Code Reviews| Index: remoting/host/remoting_me2me_host.cc |
| diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc |
| index 30d44dc7edc94b0a5f7a744ad5d6ae56bc326c2b..b7df4647b7498de1979bd5a8d788ee9e1eec8976 100644 |
| --- a/remoting/host/remoting_me2me_host.cc |
| +++ b/remoting/host/remoting_me2me_host.cc |
| @@ -33,8 +33,10 @@ |
| #include "remoting/host/host_config.h" |
| #include "remoting/host/host_event_logger.h" |
| #include "remoting/host/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/policy_hack/nat_policy.h" |
| #include "remoting/host/signaling_connector.h" |
| #include "remoting/jingle_glue/xmpp_signal_strategy.h" |
| @@ -381,8 +383,12 @@ class HostProcess |
| } |
| host_ = new ChromotingHost( |
| - context_.get(), signal_strategy_.get(), desktop_environment_.get(), |
| - network_settings); |
| + context_.get(), |
| + signal_strategy_.get(), |
| + desktop_environment_.get(), |
|
Sergey Ulanov
2012/06/13 01:57:19
keep these arguments on one line?
simonmorris
2012/06/13 16:26:33
Done.
|
| + JingleSessionManagerFactory::CreateSessionManager( |
| + network_settings, |
| + context_->url_request_context_getter())); |
| heartbeat_sender_.reset(new HeartbeatSender( |
| this, host_id_, signal_strategy_.get(), &key_pair_)); |