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

Side by Side Diff: remoting/host/ipc_desktop_environment.cc

Issue 1033913003: Touch Events capability negotiation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: back to setting a flag on DesktopEnvironmentFactory Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/ipc_desktop_environment.h" 5 #include "remoting/host/ipc_desktop_environment.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 13 matching lines...) Expand all
24 24
25 namespace remoting { 25 namespace remoting {
26 26
27 IpcDesktopEnvironment::IpcDesktopEnvironment( 27 IpcDesktopEnvironment::IpcDesktopEnvironment(
28 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, 28 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
29 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 29 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
30 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, 30 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
31 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 31 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
32 base::WeakPtr<ClientSessionControl> client_session_control, 32 base::WeakPtr<ClientSessionControl> client_session_control,
33 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, 33 base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
34 bool virtual_terminal) { 34 bool virtual_terminal,
35 bool multi_touch_enabled) {
35 DCHECK(caller_task_runner->BelongsToCurrentThread()); 36 DCHECK(caller_task_runner->BelongsToCurrentThread());
36 37
37 desktop_session_proxy_ = new DesktopSessionProxy(audio_task_runner, 38 desktop_session_proxy_ = new DesktopSessionProxy(audio_task_runner,
38 caller_task_runner, 39 caller_task_runner,
39 io_task_runner, 40 io_task_runner,
40 capture_task_runner, 41 capture_task_runner,
41 client_session_control, 42 client_session_control,
42 desktop_session_connector, 43 desktop_session_connector,
43 virtual_terminal); 44 virtual_terminal,
45 multi_touch_enabled);
44 } 46 }
45 47
46 IpcDesktopEnvironment::~IpcDesktopEnvironment() { 48 IpcDesktopEnvironment::~IpcDesktopEnvironment() {
47 } 49 }
48 50
49 scoped_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer() { 51 scoped_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer() {
50 return desktop_session_proxy_->CreateAudioCapturer(); 52 return desktop_session_proxy_->CreateAudioCapturer();
51 } 53 }
52 54
53 scoped_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() { 55 scoped_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, 89 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
88 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 90 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
89 IPC::Sender* daemon_channel) 91 IPC::Sender* daemon_channel)
90 : audio_task_runner_(audio_task_runner), 92 : audio_task_runner_(audio_task_runner),
91 caller_task_runner_(caller_task_runner), 93 caller_task_runner_(caller_task_runner),
92 capture_task_runner_(capture_task_runner), 94 capture_task_runner_(capture_task_runner),
93 io_task_runner_(io_task_runner), 95 io_task_runner_(io_task_runner),
94 curtain_enabled_(false), 96 curtain_enabled_(false),
95 daemon_channel_(daemon_channel), 97 daemon_channel_(daemon_channel),
96 next_id_(0), 98 next_id_(0),
97 connector_factory_(this) { 99 connector_factory_(this),
100 multi_touch_enabled_(false) {
98 } 101 }
99 102
100 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() { 103 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {
101 } 104 }
102 105
103 scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create( 106 scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
104 base::WeakPtr<ClientSessionControl> client_session_control) { 107 base::WeakPtr<ClientSessionControl> client_session_control) {
105 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 108 DCHECK(caller_task_runner_->BelongsToCurrentThread());
106 109
107 return make_scoped_ptr( 110 return make_scoped_ptr(
108 new IpcDesktopEnvironment(audio_task_runner_, 111 new IpcDesktopEnvironment(audio_task_runner_,
109 caller_task_runner_, 112 caller_task_runner_,
110 capture_task_runner_, 113 capture_task_runner_,
111 io_task_runner_, 114 io_task_runner_,
112 client_session_control, 115 client_session_control,
113 connector_factory_.GetWeakPtr(), 116 connector_factory_.GetWeakPtr(),
114 curtain_enabled_)); 117 curtain_enabled_,
118 multi_touch_enabled_));
115 } 119 }
116 120
117 void IpcDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { 121 void IpcDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) {
118 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 122 DCHECK(caller_task_runner_->BelongsToCurrentThread());
119 123
120 curtain_enabled_ = enable; 124 curtain_enabled_ = enable;
121 } 125 }
122 126
123 bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const { 127 bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const {
124 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 128 DCHECK(caller_task_runner_->BelongsToCurrentThread());
125 129
126 return AudioCapturer::IsSupported(); 130 return AudioCapturer::IsSupported();
127 } 131 }
128 132
133 void IpcDesktopEnvironmentFactory::SetEnableMultiTouch(bool enable) {
134 multi_touch_enabled_ = enable;
135 }
136
129 void IpcDesktopEnvironmentFactory::ConnectTerminal( 137 void IpcDesktopEnvironmentFactory::ConnectTerminal(
130 DesktopSessionProxy* desktop_session_proxy, 138 DesktopSessionProxy* desktop_session_proxy,
131 const ScreenResolution& resolution, 139 const ScreenResolution& resolution,
132 bool virtual_terminal) { 140 bool virtual_terminal) {
133 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 141 DCHECK(caller_task_runner_->BelongsToCurrentThread());
134 142
135 int id = next_id_++; 143 int id = next_id_++;
136 bool inserted = active_connections_.insert( 144 bool inserted = active_connections_.insert(
137 std::make_pair(id, desktop_session_proxy)).second; 145 std::make_pair(id, desktop_session_proxy)).second;
138 CHECK(inserted); 146 CHECK(inserted);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 if (i != active_connections_.end()) { 224 if (i != active_connections_.end()) {
217 DesktopSessionProxy* desktop_session_proxy = i->second; 225 DesktopSessionProxy* desktop_session_proxy = i->second;
218 active_connections_.erase(i); 226 active_connections_.erase(i);
219 227
220 // Disconnect the client session. 228 // Disconnect the client session.
221 desktop_session_proxy->DisconnectSession(); 229 desktop_session_proxy->DisconnectSession();
222 } 230 }
223 } 231 }
224 232
225 } // namespace remoting 233 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698