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 ce69d50e29b61712a4b276a07d9486ceb36f636b..789708033d5a56577bb0f992b6a0b223c3705fa9 100644 |
| --- a/remoting/host/remoting_me2me_host.cc |
| +++ b/remoting/host/remoting_me2me_host.cc |
| @@ -130,7 +130,8 @@ class HostProcess |
| #if defined(OS_WIN) |
| desktop_environment_factory_(new SessionDesktopEnvironmentFactory()), |
|
alexeypa (please no reviews)
2012/10/02 17:00:13
SessiondesktopEnviromentFactory's constructor take
|
| #else // !defined(OS_WIN) |
| - desktop_environment_factory_(new DesktopEnvironmentFactory()), |
| + desktop_environment_factory_(new DesktopEnvironmentFactory( |
| + context_->input_task_runner(), context_->ui_task_runner())), |
| #endif // !defined(OS_WIN) |
| desktop_resizer_(DesktopResizer::Create()), |
| exit_code_(kSuccessExitCode) |
| @@ -311,9 +312,10 @@ class HostProcess |
| void ShutdownHostProcess() { |
| DCHECK(context_->ui_task_runner()->BelongsToCurrentThread()); |
| + // Tear down resources that use ChromotingHostContext threads. |
| config_watcher_.reset(); |
| - |
| daemon_channel_.reset(); |
| + desktop_environment_factory_.reset(); |
| host_user_interface_.reset(); |
| if (policy_watcher_.get()) { |
| @@ -558,10 +560,13 @@ class HostProcess |
| } |
| host_ = new ChromotingHost( |
| - context_.get(), signal_strategy_.get(), |
| + signal_strategy_.get(), |
| desktop_environment_factory_.get(), |
| CreateHostSessionManager(network_settings, |
| - context_->url_request_context_getter())); |
| + context_->url_request_context_getter()), |
| + context_->capture_task_runner(), |
| + context_->encode_task_runner(), |
| + context_->network_task_runner()); |
| // TODO(simonmorris): Get the maximum session duration from a policy. |
| #if defined(OS_LINUX) |