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

Side by Side Diff: remoting/host/ipc_desktop_environment.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_IPC_DESKTOP_ENVIRONMENT_H_ 5 #ifndef REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
6 #define REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_ 6 #define REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 15 matching lines...) Expand all
26 26
27 namespace remoting { 27 namespace remoting {
28 28
29 class ClientSessionControl; 29 class ClientSessionControl;
30 class DesktopSessionProxy; 30 class DesktopSessionProxy;
31 class GnubbyAuthHandler; 31 class GnubbyAuthHandler;
32 class ScreenResolution; 32 class ScreenResolution;
33 33
34 // A variant of desktop environment integrating with the desktop by means of 34 // A variant of desktop environment integrating with the desktop by means of
35 // a helper process and talking to that process via IPC. 35 // a helper process and talking to that process via IPC.
36 class IpcDesktopEnvironment : public DesktopEnvironment { 36 class IpcDesktopEnvironment : public DesktopEnvironment {
Wez 2015/04/21 02:12:12 Blech. Not for this CL, but this class declaration
Rintaro Kuroiwa 2015/04/22 19:55:59 Ack. Will do a follow up patch.
37 public: 37 public:
38 // |desktop_session_connector| is used to bind DesktopSessionProxy to 38 // |desktop_session_connector| is used to bind DesktopSessionProxy to
39 // a desktop session, to be notified every time the desktop process is 39 // a desktop session, to be notified every time the desktop process is
40 // restarted. 40 // restarted.
41 IpcDesktopEnvironment( 41 IpcDesktopEnvironment(
42 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, 42 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
43 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 43 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
44 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, 44 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
45 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 45 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
46 base::WeakPtr<ClientSessionControl> client_session_control, 46 base::WeakPtr<ClientSessionControl> client_session_control,
47 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, 47 base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
48 bool virtual_terminal); 48 bool virtual_terminal,
49 bool multi_touch_enabled);
49 ~IpcDesktopEnvironment() override; 50 ~IpcDesktopEnvironment() override;
50 51
51 // DesktopEnvironment implementation. 52 // DesktopEnvironment implementation.
52 scoped_ptr<AudioCapturer> CreateAudioCapturer() override; 53 scoped_ptr<AudioCapturer> CreateAudioCapturer() override;
53 scoped_ptr<InputInjector> CreateInputInjector() override; 54 scoped_ptr<InputInjector> CreateInputInjector() override;
54 scoped_ptr<ScreenControls> CreateScreenControls() override; 55 scoped_ptr<ScreenControls> CreateScreenControls() override;
55 scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override; 56 scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override;
56 scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor() override; 57 scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor() override;
57 std::string GetCapabilities() const override; 58 std::string GetCapabilities() const override;
58 void SetCapabilities(const std::string& capabilities) override; 59 void SetCapabilities(const std::string& capabilities) override;
(...skipping 20 matching lines...) Expand all
79 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, 80 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
80 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 81 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
81 IPC::Sender* daemon_channel); 82 IPC::Sender* daemon_channel);
82 ~IpcDesktopEnvironmentFactory() override; 83 ~IpcDesktopEnvironmentFactory() override;
83 84
84 // DesktopEnvironmentFactory implementation. 85 // DesktopEnvironmentFactory implementation.
85 scoped_ptr<DesktopEnvironment> Create( 86 scoped_ptr<DesktopEnvironment> Create(
86 base::WeakPtr<ClientSessionControl> client_session_control) override; 87 base::WeakPtr<ClientSessionControl> client_session_control) override;
87 void SetEnableCurtaining(bool enable) override; 88 void SetEnableCurtaining(bool enable) override;
88 bool SupportsAudioCapture() const override; 89 bool SupportsAudioCapture() const override;
90 void SetEnableMultiTouch(bool enable) override;
89 91
90 // DesktopSessionConnector implementation. 92 // DesktopSessionConnector implementation.
91 void ConnectTerminal(DesktopSessionProxy* desktop_session_proxy, 93 void ConnectTerminal(DesktopSessionProxy* desktop_session_proxy,
92 const ScreenResolution& resolution, 94 const ScreenResolution& resolution,
93 bool virtual_terminal) override; 95 bool virtual_terminal) override;
94 void DisconnectTerminal(DesktopSessionProxy* desktop_session_proxy) override; 96 void DisconnectTerminal(DesktopSessionProxy* desktop_session_proxy) override;
95 void SetScreenResolution(DesktopSessionProxy* desktop_session_proxy, 97 void SetScreenResolution(DesktopSessionProxy* desktop_session_proxy,
96 const ScreenResolution& resolution) override; 98 const ScreenResolution& resolution) override;
97 void OnDesktopSessionAgentAttached( 99 void OnDesktopSessionAgentAttached(
98 int terminal_id, 100 int terminal_id,
(...skipping 26 matching lines...) Expand all
125 ActiveConnectionsList active_connections_; 127 ActiveConnectionsList active_connections_;
126 128
127 // Next desktop session ID. IDs are allocated sequentially starting from 0. 129 // Next desktop session ID. IDs are allocated sequentially starting from 0.
128 // This gives us more than 67 years of unique IDs assuming a new ID is 130 // This gives us more than 67 years of unique IDs assuming a new ID is
129 // allocated every second. 131 // allocated every second.
130 int next_id_; 132 int next_id_;
131 133
132 // Factory for weak pointers to DesktopSessionConnector interface. 134 // Factory for weak pointers to DesktopSessionConnector interface.
133 base::WeakPtrFactory<DesktopSessionConnector> connector_factory_; 135 base::WeakPtrFactory<DesktopSessionConnector> connector_factory_;
134 136
137 bool multi_touch_enabled_;
138
135 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironmentFactory); 139 DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironmentFactory);
136 }; 140 };
137 141
138 } // namespace remoting 142 } // namespace remoting
139 143
140 #endif // REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_ 144 #endif // REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698