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..5eb46346c804c509b63c4882c6a2c5d17609c9eb 100644 |
--- a/remoting/host/ipc_desktop_environment.cc |
+++ b/remoting/host/ipc_desktop_environment.cc |
@@ -12,6 +12,7 @@ |
#include "base/single_thread_task_runner.h" |
#include "ipc/ipc_sender.h" |
#include "media/video/capture/screen/screen_capturer.h" |
+#include "remoting/base/capabilities.h" |
#include "remoting/host/audio_capturer.h" |
#include "remoting/host/chromoting_messages.h" |
#include "remoting/host/client_session_control.h" |
@@ -36,10 +37,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 +61,14 @@ scoped_ptr<media::ScreenCapturer> IpcDesktopEnvironment::CreateVideoCapturer() { |
return desktop_session_proxy_->CreateVideoCapturer(); |
} |
+Capabilities IpcDesktopEnvironment::GetCapabilities() const { |
+ return desktop_session_proxy_->GetCapabilities(); |
+} |
+ |
+void IpcDesktopEnvironment::SetCapabilities(const Capabilities& capabilities) { |
+ return desktop_session_proxy_->SetCapabilities(capabilities); |
+} |
+ |
IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory( |
scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |