| Index: remoting/host/ipc_desktop_environment.cc
|
| diff --git a/remoting/host/ipc_desktop_environment.cc b/remoting/host/ipc_desktop_environment.cc
|
| index d7b2cb608dbb1d381c35b2d5f93eab31fc5f36c1..9338a4762d83e7e88dab6b348df8d98ecb354104 100644
|
| --- a/remoting/host/ipc_desktop_environment.cc
|
| +++ b/remoting/host/ipc_desktop_environment.cc
|
| @@ -31,7 +31,8 @@ IpcDesktopEnvironment::IpcDesktopEnvironment(
|
| scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
|
| base::WeakPtr<ClientSessionControl> client_session_control,
|
| base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
|
| - bool virtual_terminal) {
|
| + bool virtual_terminal,
|
| + bool multi_touch_enabled) {
|
| DCHECK(caller_task_runner->BelongsToCurrentThread());
|
|
|
| desktop_session_proxy_ = new DesktopSessionProxy(audio_task_runner,
|
| @@ -40,7 +41,8 @@ IpcDesktopEnvironment::IpcDesktopEnvironment(
|
| capture_task_runner,
|
| client_session_control,
|
| desktop_session_connector,
|
| - virtual_terminal);
|
| + virtual_terminal,
|
| + multi_touch_enabled);
|
| }
|
|
|
| IpcDesktopEnvironment::~IpcDesktopEnvironment() {
|
| @@ -94,7 +96,8 @@ IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory(
|
| curtain_enabled_(false),
|
| daemon_channel_(daemon_channel),
|
| next_id_(0),
|
| - connector_factory_(this) {
|
| + connector_factory_(this),
|
| + multi_touch_enabled_(false) {
|
| }
|
|
|
| IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {
|
| @@ -111,7 +114,8 @@ scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
|
| io_task_runner_,
|
| client_session_control,
|
| connector_factory_.GetWeakPtr(),
|
| - curtain_enabled_));
|
| + curtain_enabled_,
|
| + multi_touch_enabled_));
|
| }
|
|
|
| void IpcDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) {
|
| @@ -126,6 +130,10 @@ bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const {
|
| return AudioCapturer::IsSupported();
|
| }
|
|
|
| +void IpcDesktopEnvironmentFactory::SetEnableMultiTouch(bool enable) {
|
| + multi_touch_enabled_ = enable;
|
| +}
|
| +
|
| void IpcDesktopEnvironmentFactory::ConnectTerminal(
|
| DesktopSessionProxy* desktop_session_proxy,
|
| const ScreenResolution& resolution,
|
|
|