| Index: remoting/host/desktop_environment.cc
|
| diff --git a/remoting/host/desktop_environment.cc b/remoting/host/desktop_environment.cc
|
| index fbf4ffc19785745de90647b6a209b2dad774f400..c955cfd088809bea24c8e1125192b979d17622ce 100644
|
| --- a/remoting/host/desktop_environment.cc
|
| +++ b/remoting/host/desktop_environment.cc
|
| @@ -11,19 +11,30 @@
|
| #include "remoting/host/chromoting_host_context.h"
|
| #include "remoting/host/event_executor.h"
|
|
|
| +#if defined(OS_WIN)
|
| +#include "remoting/host/session_event_executor_win.h"
|
| +#endif
|
| +
|
| namespace remoting {
|
|
|
| // static
|
| DesktopEnvironment* DesktopEnvironment::Create(ChromotingHostContext* context) {
|
| scoped_ptr<Capturer> capturer(Capturer::Create());
|
| scoped_ptr<EventExecutor> event_executor(
|
| - EventExecutor::Create(context->desktop_message_loop(), capturer.get()));
|
| + EventExecutor::Create(context->desktop_message_loop(),
|
| + capturer.get()));
|
|
|
| if (capturer.get() == NULL || event_executor.get() == NULL) {
|
| LOG(ERROR) << "Unable to create DesktopEnvironment";
|
| return NULL;
|
| }
|
|
|
| +#if defined(OS_WIN)
|
| + event_executor.reset(new SessionEventExecutor(context->desktop_message_loop(),
|
| + context->io_message_loop(),
|
| + event_executor.Pass()));
|
| +#endif
|
| +
|
| return new DesktopEnvironment(context,
|
| capturer.release(),
|
| event_executor.release());
|
|
|