| Index: remoting/host/ipc_desktop_environment.cc
|
| diff --git a/remoting/host/ipc_desktop_environment.cc b/remoting/host/ipc_desktop_environment.cc
|
| index 797cbd530bff4d392092d295042ddb79028a580f..4254c57bc18a0385e31b0b78cfa18211341cf429 100644
|
| --- a/remoting/host/ipc_desktop_environment.cc
|
| +++ b/remoting/host/ipc_desktop_environment.cc
|
| @@ -36,10 +36,9 @@ IpcDesktopEnvironment::IpcDesktopEnvironment(
|
| caller_task_runner,
|
| io_task_runner,
|
| capture_task_runner,
|
| - client_session_control);
|
| -
|
| - desktop_session_proxy_->ConnectToDesktopSession(desktop_session_connector,
|
| - virtual_terminal);
|
| + client_session_control,
|
| + desktop_session_connector,
|
| + virtual_terminal);
|
| }
|
|
|
| IpcDesktopEnvironment::~IpcDesktopEnvironment() {
|
| @@ -61,6 +60,14 @@ scoped_ptr<media::ScreenCapturer> IpcDesktopEnvironment::CreateVideoCapturer() {
|
| return desktop_session_proxy_->CreateVideoCapturer();
|
| }
|
|
|
| +std::string IpcDesktopEnvironment::GetCapabilities() const {
|
| + return desktop_session_proxy_->GetCapabilities();
|
| +}
|
| +
|
| +void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) {
|
| + return desktop_session_proxy_->SetCapabilities(capabilities);
|
| +}
|
| +
|
| IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory(
|
| scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
|
|
|