| Index: remoting/host/desktop_environment.h
|
| diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h
|
| index 0df2e01a3fc168c41b83e96815b27a67daf0c7e2..2befcef247cce47060cf80fb72d1136bfd796f73 100644
|
| --- a/remoting/host/desktop_environment.h
|
| +++ b/remoting/host/desktop_environment.h
|
| @@ -5,8 +5,6 @@
|
| #ifndef REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
|
| #define REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
|
|
|
| -#include <string>
|
| -
|
| #include "base/basictypes.h"
|
| #include "base/callback_forward.h"
|
| #include "base/memory/ref_counted.h"
|
| @@ -24,6 +22,7 @@ class ScreenCapturer;
|
| namespace remoting {
|
|
|
| class AudioCapturer;
|
| +class Capabilities;
|
| class ClientSessionControl;
|
| class InputInjector;
|
| class ScreenControls;
|
| @@ -40,6 +39,13 @@ class DesktopEnvironment {
|
| virtual scoped_ptr<InputInjector> CreateInputInjector() = 0;
|
| virtual scoped_ptr<ScreenControls> CreateScreenControls() = 0;
|
| virtual scoped_ptr<media::ScreenCapturer> CreateVideoCapturer() = 0;
|
| +
|
| + // Returns the set of all capabilities supported by |this|.
|
| + virtual Capabilities GetCapabilities() const = 0;
|
| +
|
| + // Passes the final set of capabilities negotiated between the client and host
|
| + // to |this|.
|
| + virtual void SetCapabilities(const Capabilities& capabilities) = 0;
|
| };
|
|
|
| // Used to create |DesktopEnvironment| instances.
|
|
|