| Index: remoting/host/desktop_environment.h
|
| diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h
|
| index 90bab71eac624323f810a7ff66c25bc9ecd7db21..7d5846b7b383c7f108fc9b920c17622f5d62eef3 100644
|
| --- a/remoting/host/desktop_environment.h
|
| +++ b/remoting/host/desktop_environment.h
|
| @@ -7,7 +7,6 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/scoped_ptr.h"
|
| -#include "remoting/protocol/host_stub.h"
|
|
|
| namespace remoting {
|
|
|
| @@ -17,44 +16,16 @@ class InputStub;
|
|
|
| class Capturer;
|
|
|
| -class DesktopEnvironment : public protocol::HostStub {
|
| +class DesktopEnvironment {
|
| public:
|
| - // Callback interface for passing events to the ChromotingHost.
|
| - class EventHandler {
|
| - public:
|
| - virtual ~EventHandler() {}
|
| -
|
| - // Called to signal that local login has succeeded and ChromotingHost can
|
| - // proceed with the next step.
|
| - virtual void LocalLoginSucceeded() = 0;
|
| -
|
| - // Called to signal that local login has failed.
|
| - virtual void LocalLoginFailed() = 0;
|
| - };
|
| -
|
| DesktopEnvironment(Capturer* capturer, protocol::InputStub* input_stub);
|
| virtual ~DesktopEnvironment();
|
|
|
| Capturer* capturer() const { return capturer_.get(); }
|
| protocol::InputStub* input_stub() const { return input_stub_.get(); }
|
| - // Called by ChromotingHost constructor
|
| - void set_event_handler(EventHandler* event_handler) {
|
| - event_handler_ = event_handler;
|
| - }
|
| -
|
| - // protocol::HostStub interface.
|
| - virtual void SuggestResolution(
|
| - const protocol::SuggestResolutionRequest* msg, Task* done);
|
| - virtual void BeginSessionRequest(
|
| - const protocol::LocalLoginCredentials* credentials, Task* done);
|
| -
|
| - protected:
|
| - // Allow access by DesktopEnvironmentFake for unittest.
|
| - EventHandler* event_handler_;
|
|
|
| private:
|
| - // Capturer to be used by ScreenRecorder. Once the ScreenRecorder is
|
| - // constructed this is set to NULL.
|
| + // Capturer to be used by ScreenRecorder.
|
| scoped_ptr<Capturer> capturer_;
|
|
|
| // InputStub in the host executes input events received from the client.
|
|
|