| 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);
|
| };
|
|
|
|
|