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

Unified Diff: remoting/host/desktop_session_proxy.h

Issue 13932020: Set the initial resolution of an RDP session to the client screen resolution if it is available. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Clang Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/desktop_process_unittest.cc ('k') | remoting/host/desktop_session_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_session_proxy.h
diff --git a/remoting/host/desktop_session_proxy.h b/remoting/host/desktop_session_proxy.h
index c172228c1df470170efb6dec4844255988f1918f..34eac5559f28df5ec1f49d7fce32acd72a1d8408 100644
--- a/remoting/host/desktop_session_proxy.h
+++ b/remoting/host/desktop_session_proxy.h
@@ -70,13 +70,17 @@ class DesktopSessionProxy
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
- base::WeakPtr<ClientSessionControl> client_session_control);
+ base::WeakPtr<ClientSessionControl> client_session_control,
+ base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
+ bool virtual_terminal);
// Mirrors DesktopEnvironment.
scoped_ptr<AudioCapturer> CreateAudioCapturer();
scoped_ptr<InputInjector> CreateInputInjector();
scoped_ptr<ScreenControls> CreateScreenControls();
scoped_ptr<media::ScreenCapturer> CreateVideoCapturer();
+ std::string GetCapabilities() const;
+ void SetCapabilities(const std::string& capabilities);
// IPC::Listener implementation.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
@@ -87,11 +91,6 @@ class DesktopSessionProxy
bool AttachToDesktop(base::ProcessHandle desktop_process,
IPC::PlatformFileForTransit desktop_pipe);
- // Binds |this| to a desktop session.
- void ConnectToDesktopSession(
- base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
- bool virtual_terminal);
-
// Closes the connection to the desktop session agent and cleans up
// the associated resources.
void DetachFromDesktop();
@@ -183,7 +182,7 @@ class DesktopSessionProxy
// Used to disconnect the client session.
base::WeakPtr<ClientSessionControl> client_session_control_;
- // Used to bind to a desktop session and receive notifications every time
+ // Used to create a desktop session and receive notifications every time
// the desktop process is replaced.
base::WeakPtr<DesktopSessionConnector> desktop_session_connector_;
@@ -205,6 +204,11 @@ class DesktopSessionProxy
// desktop session agent.
ScreenResolution screen_resolution_;
+ // True if |this| has been connected to the desktop session.
+ bool is_desktop_session_connected_;
+
+ bool virtual_terminal_;
+
DISALLOW_COPY_AND_ASSIGN(DesktopSessionProxy);
};
« no previous file with comments | « remoting/host/desktop_process_unittest.cc ('k') | remoting/host/desktop_session_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698