Chromium Code Reviews| Index: remoting/host/plugin/host_script_object.cc |
| diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc |
| index 91587520b453f7a6749128615c14a4faee1fd144..cc39ceee0ebe37e4e3be94a9ef37c4ba130e5f75 100644 |
| --- a/remoting/host/plugin/host_script_object.cc |
| +++ b/remoting/host/plugin/host_script_object.cc |
| @@ -22,6 +22,8 @@ |
| #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/network_settings.h" |
| #include "remoting/host/pin_hash.h" |
| #include "remoting/host/plugin/daemon_controller.h" |
| #include "remoting/host/plugin/host_log_handler.h" |
| @@ -556,10 +558,14 @@ void HostNPScriptObject::FinishConnectNetworkThread( |
| // Create the Host. |
| LOG(INFO) << "NAT state: " << nat_traversal_enabled_; |
| host_ = new ChromotingHost( |
| - host_context_.get(), signal_strategy_.get(), desktop_environment_.get(), |
| - NetworkSettings(nat_traversal_enabled_ ? |
| - NetworkSettings::NAT_TRAVERSAL_ENABLED : |
| - NetworkSettings::NAT_TRAVERSAL_DISABLED)); |
| + host_context_.get(), |
|
Sergey Ulanov
2012/06/13 01:57:19
nit: IMHO the code is more readable when if we kee
simonmorris
2012/06/13 16:26:33
Done.
|
| + signal_strategy_.get(), |
| + desktop_environment_.get(), |
| + JingleSessionManagerFactory::CreateSessionManager( |
| + NetworkSettings(nat_traversal_enabled_ ? |
| + NetworkSettings::NAT_TRAVERSAL_ENABLED : |
| + NetworkSettings::NAT_TRAVERSAL_DISABLED), |
| + host_context_->url_request_context_getter())); |
| host_->AddStatusObserver(this); |
| log_to_server_.reset( |
| new LogToServer(host_, ServerLogEntry::IT2ME, signal_strategy_.get())); |