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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 12879006: Removed task runners from the DesktopEnviroment interface and introduced ScreenControls/ClientSessio (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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/resizing_host_observer.h » ('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 58ed0dc7d33bff6ece37681a24295c0b3d4e5569..8ef959a6c0af2f0aeb36430340f993be1ea14186 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -590,19 +590,27 @@ void HostProcess::StartOnUiThread() {
#if defined(REMOTING_MULTI_PROCESS)
IpcDesktopEnvironmentFactory* desktop_environment_factory =
new IpcDesktopEnvironmentFactory(
+ context_->audio_task_runner(),
context_->network_task_runner(),
+ context_->video_capture_task_runner(),
context_->network_task_runner(),
daemon_channel_.get());
desktop_session_connector_ = desktop_environment_factory;
#else // !defined(REMOTING_MULTI_PROCESS)
DesktopEnvironmentFactory* desktop_environment_factory =
new SessionDesktopEnvironmentFactory(
+ context_->network_task_runner(),
+ context_->input_task_runner(),
+ context_->ui_task_runner(),
base::Bind(&HostProcess::SendSasToConsole, this));
#endif // !defined(REMOTING_MULTI_PROCESS)
#else // !defined(OS_WIN)
DesktopEnvironmentFactory* desktop_environment_factory =
- new Me2MeDesktopEnvironmentFactory();
+ new Me2MeDesktopEnvironmentFactory(
+ context_->network_task_runner(),
+ context_->input_task_runner(),
+ context_->ui_task_runner());
#endif // !defined(OS_WIN)
desktop_environment_factory_.reset(desktop_environment_factory);
« no previous file with comments | « remoting/host/plugin/host_script_object.cc ('k') | remoting/host/resizing_host_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698