| Index: remoting/host/remoting_me2me_host.cc
|
| diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
|
| index 65bd8cc05c57a648341babd9776ff92578c83c24..387a59e7057217a616d48d1ef5fb8ff6f9aa54fb 100644
|
| --- a/remoting/host/remoting_me2me_host.cc
|
| +++ b/remoting/host/remoting_me2me_host.cc
|
| @@ -569,24 +569,19 @@ void HostProcess::StartOnUiThread() {
|
| #if defined(REMOTING_MULTI_PROCESS)
|
| IpcDesktopEnvironmentFactory* desktop_environment_factory =
|
| new IpcDesktopEnvironmentFactory(
|
| - daemon_channel_.get(),
|
| - context_->audio_task_runner(),
|
| - context_->input_task_runner(),
|
| context_->network_task_runner(),
|
| - context_->ui_task_runner(),
|
| - context_->video_capture_task_runner());
|
| + daemon_channel_.get());
|
| desktop_session_connector_ = desktop_environment_factory;
|
| #else // !defined(REMOTING_MULTI_PROCESS)
|
| DesktopEnvironmentFactory* desktop_environment_factory =
|
| new SessionDesktopEnvironmentFactory(
|
| - context_->input_task_runner(), context_->ui_task_runner(),
|
| + context_->network_task_runner(),
|
| base::Bind(&HostProcess::SendSasToConsole, this));
|
| #endif // !defined(REMOTING_MULTI_PROCESS)
|
|
|
| #else // !defined(OS_WIN)
|
| DesktopEnvironmentFactory* desktop_environment_factory =
|
| - new DesktopEnvironmentFactory(
|
| - context_->input_task_runner(), context_->ui_task_runner());
|
| + new DesktopEnvironmentFactory(context_->network_task_runner());
|
| #endif // !defined(OS_WIN)
|
|
|
| desktop_environment_factory_.reset(desktop_environment_factory);
|
| @@ -894,9 +889,11 @@ void HostProcess::StartHost() {
|
| CreateHostSessionManager(network_settings,
|
| context_->url_request_context_getter()),
|
| context_->audio_task_runner(),
|
| + context_->input_task_runner(),
|
| context_->video_capture_task_runner(),
|
| context_->video_encode_task_runner(),
|
| - context_->network_task_runner());
|
| + context_->network_task_runner(),
|
| + context_->ui_task_runner());
|
|
|
| // TODO(simonmorris): Get the maximum session duration from a policy.
|
| #if defined(OS_LINUX)
|
|
|