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

Side by Side Diff: remoting/host/desktop_session_proxy.h

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
« no previous file with comments | « remoting/host/basic_desktop_environment.cc ('k') | remoting/host/desktop_session_proxy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef REMOTING_HOST_DESKTOP_SESSION_PROXY_H_ 5 #ifndef REMOTING_HOST_DESKTOP_SESSION_PROXY_H_
6 #define REMOTING_HOST_DESKTOP_SESSION_PROXY_H_ 6 #define REMOTING_HOST_DESKTOP_SESSION_PROXY_H_
7 7
8 #include <cstdint> 8 #include <cstdint>
9 #include <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 : public base::RefCountedThreadSafe<DesktopSessionProxy, 69 : public base::RefCountedThreadSafe<DesktopSessionProxy,
70 DesktopSessionProxyTraits>, 70 DesktopSessionProxyTraits>,
71 public IPC::Listener { 71 public IPC::Listener {
72 public: 72 public:
73 DesktopSessionProxy( 73 DesktopSessionProxy(
74 scoped_refptr<base::SingleThreadTaskRunner> audio_capture_task_runner, 74 scoped_refptr<base::SingleThreadTaskRunner> audio_capture_task_runner,
75 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 75 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
76 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 76 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
77 base::WeakPtr<ClientSessionControl> client_session_control, 77 base::WeakPtr<ClientSessionControl> client_session_control,
78 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, 78 base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
79 bool virtual_terminal); 79 bool virtual_terminal,
80 bool supports_touch_events);
80 81
81 // Mirrors DesktopEnvironment. 82 // Mirrors DesktopEnvironment.
82 std::unique_ptr<AudioCapturer> CreateAudioCapturer(); 83 std::unique_ptr<AudioCapturer> CreateAudioCapturer();
83 std::unique_ptr<InputInjector> CreateInputInjector(); 84 std::unique_ptr<InputInjector> CreateInputInjector();
84 std::unique_ptr<ScreenControls> CreateScreenControls(); 85 std::unique_ptr<ScreenControls> CreateScreenControls();
85 std::unique_ptr<webrtc::DesktopCapturer> CreateVideoCapturer(); 86 std::unique_ptr<webrtc::DesktopCapturer> CreateVideoCapturer();
86 std::unique_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor(); 87 std::unique_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor();
87 std::string GetCapabilities() const; 88 std::string GetCapabilities() const;
88 void SetCapabilities(const std::string& capabilities); 89 void SetCapabilities(const std::string& capabilities);
89 90
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 216
216 // Keeps the desired screen resolution so it can be passed to a newly attached 217 // Keeps the desired screen resolution so it can be passed to a newly attached
217 // desktop session agent. 218 // desktop session agent.
218 ScreenResolution screen_resolution_; 219 ScreenResolution screen_resolution_;
219 220
220 // True if |this| has been connected to the desktop session. 221 // True if |this| has been connected to the desktop session.
221 bool is_desktop_session_connected_; 222 bool is_desktop_session_connected_;
222 223
223 bool virtual_terminal_; 224 bool virtual_terminal_;
224 225
226 // True if touch events are supported by the desktop session.
227 bool supports_touch_events_;
228
225 // Stores the session id for the proxied desktop process. 229 // Stores the session id for the proxied desktop process.
226 uint32_t desktop_session_id_ = UINT32_MAX; 230 uint32_t desktop_session_id_ = UINT32_MAX;
227 231
228 DISALLOW_COPY_AND_ASSIGN(DesktopSessionProxy); 232 DISALLOW_COPY_AND_ASSIGN(DesktopSessionProxy);
229 }; 233 };
230 234
231 // Destroys |DesktopSessionProxy| instances on the caller's thread. 235 // Destroys |DesktopSessionProxy| instances on the caller's thread.
232 struct DesktopSessionProxyTraits { 236 struct DesktopSessionProxyTraits {
233 static void Destruct(const DesktopSessionProxy* desktop_session_proxy); 237 static void Destruct(const DesktopSessionProxy* desktop_session_proxy);
234 }; 238 };
235 239
236 } // namespace remoting 240 } // namespace remoting
237 241
238 #endif // REMOTING_HOST_DESKTOP_SESSION_PROXY_H_ 242 #endif // REMOTING_HOST_DESKTOP_SESSION_PROXY_H_
OLDNEW
« no previous file with comments | « remoting/host/basic_desktop_environment.cc ('k') | remoting/host/desktop_session_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698