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

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

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 #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 <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 DesktopSessionProxyTraits>, 68 DesktopSessionProxyTraits>,
69 public IPC::Listener { 69 public IPC::Listener {
70 public: 70 public:
71 DesktopSessionProxy( 71 DesktopSessionProxy(
72 scoped_refptr<base::SingleThreadTaskRunner> audio_capture_task_runner, 72 scoped_refptr<base::SingleThreadTaskRunner> audio_capture_task_runner,
73 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 73 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
74 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 74 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
75 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, 75 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
76 base::WeakPtr<ClientSessionControl> client_session_control, 76 base::WeakPtr<ClientSessionControl> client_session_control,
77 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, 77 base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
78 bool virtual_terminal); 78 bool virtual_terminal,
79 bool multi_touch_enabled);
79 80
80 // Mirrors DesktopEnvironment. 81 // Mirrors DesktopEnvironment.
81 scoped_ptr<AudioCapturer> CreateAudioCapturer(); 82 scoped_ptr<AudioCapturer> CreateAudioCapturer();
82 scoped_ptr<InputInjector> CreateInputInjector(); 83 scoped_ptr<InputInjector> CreateInputInjector();
83 scoped_ptr<ScreenControls> CreateScreenControls(); 84 scoped_ptr<ScreenControls> CreateScreenControls();
84 scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer(); 85 scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer();
85 scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor(); 86 scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor();
86 std::string GetCapabilities() const; 87 std::string GetCapabilities() const;
87 void SetCapabilities(const std::string& capabilities); 88 void SetCapabilities(const std::string& capabilities);
88 89
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 221
221 // Keeps the desired screen resolution so it can be passed to a newly attached 222 // Keeps the desired screen resolution so it can be passed to a newly attached
222 // desktop session agent. 223 // desktop session agent.
223 ScreenResolution screen_resolution_; 224 ScreenResolution screen_resolution_;
224 225
225 // True if |this| has been connected to the desktop session. 226 // True if |this| has been connected to the desktop session.
226 bool is_desktop_session_connected_; 227 bool is_desktop_session_connected_;
227 228
228 bool virtual_terminal_; 229 bool virtual_terminal_;
229 230
231 bool multi_touch_enabled_;
232
230 DISALLOW_COPY_AND_ASSIGN(DesktopSessionProxy); 233 DISALLOW_COPY_AND_ASSIGN(DesktopSessionProxy);
231 }; 234 };
232 235
233 // Destroys |DesktopSessionProxy| instances on the caller's thread. 236 // Destroys |DesktopSessionProxy| instances on the caller's thread.
234 struct DesktopSessionProxyTraits { 237 struct DesktopSessionProxyTraits {
235 static void Destruct(const DesktopSessionProxy* desktop_session_proxy); 238 static void Destruct(const DesktopSessionProxy* desktop_session_proxy);
236 }; 239 };
237 240
238 } // namespace remoting 241 } // namespace remoting
239 242
240 #endif // REMOTING_HOST_DESKTOP_SESSION_PROXY_H_ 243 #endif // REMOTING_HOST_DESKTOP_SESSION_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698