Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(971)

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 11018004: Fix ChromotingHost and DesktopEnvironmentFactory references to TaskRunners. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Windows build. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/plugin/host_script_object.cc ('k') | remoting/host/simple_host_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..9e259f6c3ce4d30d934522c26013a9ceb85e412e 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -128,9 +128,11 @@ class HostProcess
restarting_(false),
shutting_down_(false),
#if defined(OS_WIN)
- desktop_environment_factory_(new SessionDesktopEnvironmentFactory()),
+ desktop_environment_factory_(new SessionDesktopEnvironmentFactory(
+ context_->input_task_runner(), context_->ui_task_runner())),
#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 +313,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 +561,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)
« no previous file with comments | « remoting/host/plugin/host_script_object.cc ('k') | remoting/host/simple_host_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698