| Index: remoting/host/it2me_desktop_environment.cc
|
| diff --git a/remoting/host/it2me_desktop_environment.cc b/remoting/host/it2me_desktop_environment.cc
|
| index 511f4cc12e33331434cb62122427b643f11de455..f2f7cf059f2ba34df0b773a56fb27d5504f3710d 100644
|
| --- a/remoting/host/it2me_desktop_environment.cc
|
| +++ b/remoting/host/it2me_desktop_environment.cc
|
| @@ -27,11 +27,13 @@ It2MeDesktopEnvironment::~It2MeDesktopEnvironment() {
|
|
|
| It2MeDesktopEnvironment::It2MeDesktopEnvironment(
|
| 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,
|
| base::WeakPtr<ClientSessionControl> client_session_control,
|
| bool supports_touch_events)
|
| : BasicDesktopEnvironment(caller_task_runner,
|
| + video_capture_task_runner,
|
| input_task_runner,
|
| ui_task_runner,
|
| supports_touch_events) {
|
| @@ -72,25 +74,23 @@ It2MeDesktopEnvironment::It2MeDesktopEnvironment(
|
|
|
| It2MeDesktopEnvironmentFactory::It2MeDesktopEnvironmentFactory(
|
| 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)
|
| : BasicDesktopEnvironmentFactory(caller_task_runner,
|
| + video_capture_task_runner,
|
| input_task_runner,
|
| - ui_task_runner) {
|
| -}
|
| + ui_task_runner) {}
|
|
|
| -It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() {
|
| -}
|
| +It2MeDesktopEnvironmentFactory::~It2MeDesktopEnvironmentFactory() {}
|
|
|
| scoped_ptr<DesktopEnvironment> It2MeDesktopEnvironmentFactory::Create(
|
| base::WeakPtr<ClientSessionControl> client_session_control) {
|
| DCHECK(caller_task_runner()->BelongsToCurrentThread());
|
|
|
| - return make_scoped_ptr(new It2MeDesktopEnvironment(caller_task_runner(),
|
| - input_task_runner(),
|
| - ui_task_runner(),
|
| - client_session_control,
|
| - supports_touch_events()));
|
| + return make_scoped_ptr(new It2MeDesktopEnvironment(
|
| + caller_task_runner(), video_capture_task_runner(), input_task_runner(),
|
| + ui_task_runner(), client_session_control, supports_touch_events()));
|
| }
|
|
|
| } // namespace remoting
|
|
|