Index: remoting/host/win/session_desktop_environment.cc |
diff --git a/remoting/host/win/session_desktop_environment.cc b/remoting/host/win/session_desktop_environment.cc |
index 045562f1ad57509b8a3a0008d27860ffc4cc6f41..9d9f8b2ba371604a742f5f7e344a8bef4563d047 100644 |
--- a/remoting/host/win/session_desktop_environment.cc |
+++ b/remoting/host/win/session_desktop_environment.cc |
@@ -29,40 +29,43 @@ scoped_ptr<InputInjector> SessionDesktopEnvironment::CreateInputInjector() { |
SessionDesktopEnvironment::SessionDesktopEnvironment( |
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
+ scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
const base::Closure& inject_sas, |
bool supports_touch_events) |
: Me2MeDesktopEnvironment(caller_task_runner, |
+ video_capture_task_runner, |
input_task_runner, |
ui_task_runner, |
supports_touch_events), |
- inject_sas_(inject_sas) { |
-} |
+ inject_sas_(inject_sas) {} |
SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory( |
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
+ scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
const base::Closure& inject_sas) |
: Me2MeDesktopEnvironmentFactory(caller_task_runner, |
+ video_capture_task_runner, |
input_task_runner, |
ui_task_runner), |
inject_sas_(inject_sas) { |
DCHECK(caller_task_runner->BelongsToCurrentThread()); |
} |
-SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() { |
-} |
+SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() {} |
scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create( |
base::WeakPtr<ClientSessionControl> client_session_control) { |
DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
scoped_ptr<SessionDesktopEnvironment> desktop_environment( |
- new SessionDesktopEnvironment(caller_task_runner(), input_task_runner(), |
- ui_task_runner(), inject_sas_, |
- supports_touch_events())); |
+ new SessionDesktopEnvironment(caller_task_runner(), |
+ video_capture_task_runner(), |
+ input_task_runner(), ui_task_runner(), |
+ inject_sas_, supports_touch_events())); |
if (!desktop_environment->InitializeSecurity(client_session_control, |
curtain_enabled())) { |
return nullptr; |