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

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

Issue 2458513004: Revert of Remove supports_touch_events flag from BasicDesktopEnvironment (Closed)
Patch Set: Created 4 years, 1 month 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 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" 24 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
25 25
26 namespace remoting { 26 namespace remoting {
27 27
28 IpcDesktopEnvironment::IpcDesktopEnvironment( 28 IpcDesktopEnvironment::IpcDesktopEnvironment(
29 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, 29 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
30 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 30 scoped_refptr<base::SingleThreadTaskRunner> caller_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 supports_touch_events) {
35 DCHECK(caller_task_runner->BelongsToCurrentThread()); 36 DCHECK(caller_task_runner->BelongsToCurrentThread());
36 37
37 desktop_session_proxy_ = new DesktopSessionProxy( 38 desktop_session_proxy_ = new DesktopSessionProxy(
38 audio_task_runner, caller_task_runner, io_task_runner, 39 audio_task_runner, caller_task_runner, io_task_runner,
39 client_session_control, desktop_session_connector, virtual_terminal); 40 client_session_control, desktop_session_connector, virtual_terminal,
41 supports_touch_events);
40 } 42 }
41 43
42 IpcDesktopEnvironment::~IpcDesktopEnvironment() {} 44 IpcDesktopEnvironment::~IpcDesktopEnvironment() {}
43 45
44 std::unique_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer() { 46 std::unique_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer() {
45 return desktop_session_proxy_->CreateAudioCapturer(); 47 return desktop_session_proxy_->CreateAudioCapturer();
46 } 48 }
47 49
48 std::unique_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() { 50 std::unique_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() {
49 return desktop_session_proxy_->CreateInputInjector(); 51 return desktop_session_proxy_->CreateInputInjector();
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 connector_factory_(this) {} 89 connector_factory_(this) {}
88 90
89 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {} 91 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {}
90 92
91 std::unique_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create( 93 std::unique_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
92 base::WeakPtr<ClientSessionControl> client_session_control) { 94 base::WeakPtr<ClientSessionControl> client_session_control) {
93 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 95 DCHECK(caller_task_runner_->BelongsToCurrentThread());
94 96
95 return base::MakeUnique<IpcDesktopEnvironment>( 97 return base::MakeUnique<IpcDesktopEnvironment>(
96 audio_task_runner_, caller_task_runner_, io_task_runner_, 98 audio_task_runner_, caller_task_runner_, io_task_runner_,
97 client_session_control, connector_factory_.GetWeakPtr(), 99 client_session_control, connector_factory_.GetWeakPtr(), curtain_enabled_,
98 curtain_enabled_); 100 supports_touch_events_);
99 } 101 }
100 102
101 void IpcDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { 103 void IpcDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) {
102 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 104 DCHECK(caller_task_runner_->BelongsToCurrentThread());
103 105
104 curtain_enabled_ = enable; 106 curtain_enabled_ = enable;
105 } 107 }
106 108
107 bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const { 109 bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const {
108 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 110 DCHECK(caller_task_runner_->BelongsToCurrentThread());
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 if (i != active_connections_.end()) { 202 if (i != active_connections_.end()) {
201 DesktopSessionProxy* desktop_session_proxy = i->second; 203 DesktopSessionProxy* desktop_session_proxy = i->second;
202 active_connections_.erase(i); 204 active_connections_.erase(i);
203 205
204 // Disconnect the client session. 206 // Disconnect the client session.
205 desktop_session_proxy->DisconnectSession(protocol::OK); 207 desktop_session_proxy->DisconnectSession(protocol::OK);
206 } 208 }
207 } 209 }
208 210
209 } // namespace remoting 211 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/ipc_desktop_environment.h ('k') | remoting/host/ipc_desktop_environment_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698