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

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

Issue 2529533003: Pass DesktopEnvironmentOptions form network to desktop process. (Closed)
Patch Set: Created 4 years 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 <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 const DesktopEnvironmentOptions& options);
80 80
81 // Mirrors DesktopEnvironment. 81 // Mirrors DesktopEnvironment.
82 std::unique_ptr<AudioCapturer> CreateAudioCapturer(); 82 std::unique_ptr<AudioCapturer> CreateAudioCapturer();
83 std::unique_ptr<InputInjector> CreateInputInjector(); 83 std::unique_ptr<InputInjector> CreateInputInjector();
84 std::unique_ptr<ScreenControls> CreateScreenControls(); 84 std::unique_ptr<ScreenControls> CreateScreenControls();
85 std::unique_ptr<webrtc::DesktopCapturer> CreateVideoCapturer(); 85 std::unique_ptr<webrtc::DesktopCapturer> CreateVideoCapturer();
86 std::unique_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor(); 86 std::unique_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor();
87 std::string GetCapabilities() const; 87 std::string GetCapabilities() const;
88 void SetCapabilities(const std::string& capabilities); 88 void SetCapabilities(const std::string& capabilities);
89 89
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 // frame. 209 // frame.
210 SharedBuffers shared_buffers_; 210 SharedBuffers shared_buffers_;
211 211
212 // Keeps the desired screen resolution so it can be passed to a newly attached 212 // Keeps the desired screen resolution so it can be passed to a newly attached
213 // desktop session agent. 213 // desktop session agent.
214 ScreenResolution screen_resolution_; 214 ScreenResolution screen_resolution_;
215 215
216 // True if |this| has been connected to the desktop session. 216 // True if |this| has been connected to the desktop session.
217 bool is_desktop_session_connected_; 217 bool is_desktop_session_connected_;
218 218
219 bool virtual_terminal_; 219 DesktopEnvironmentOptions options_;
220 220
221 // Stores the session id for the proxied desktop process. 221 // Stores the session id for the proxied desktop process.
222 uint32_t desktop_session_id_ = UINT32_MAX; 222 uint32_t desktop_session_id_ = UINT32_MAX;
223 223
224 DISALLOW_COPY_AND_ASSIGN(DesktopSessionProxy); 224 DISALLOW_COPY_AND_ASSIGN(DesktopSessionProxy);
225 }; 225 };
226 226
227 // Destroys |DesktopSessionProxy| instances on the caller's thread. 227 // Destroys |DesktopSessionProxy| instances on the caller's thread.
228 struct DesktopSessionProxyTraits { 228 struct DesktopSessionProxyTraits {
229 static void Destruct(const DesktopSessionProxy* desktop_session_proxy); 229 static void Destruct(const DesktopSessionProxy* desktop_session_proxy);
230 }; 230 };
231 231
232 } // namespace remoting 232 } // namespace remoting
233 233
234 #endif // REMOTING_HOST_DESKTOP_SESSION_PROXY_H_ 234 #endif // REMOTING_HOST_DESKTOP_SESSION_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698