| Index: remoting/host/desktop_environment.h
|
| diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h
|
| index f95089bd90a971a40cf97433c5cabdb658da541a..4474a12aeb5e42e629b7329ff92950853e376315 100644
|
| --- a/remoting/host/desktop_environment.h
|
| +++ b/remoting/host/desktop_environment.h
|
| @@ -18,24 +18,31 @@ namespace remoting {
|
| class Capturer;
|
| class ChromotingHost;
|
| class ChromotingHostContext;
|
| -class EventExecutor;
|
| +
|
| +namespace protocol {
|
| +class InputStub;
|
| +};
|
|
|
| class DesktopEnvironment {
|
| public:
|
| - static DesktopEnvironment* Create(ChromotingHostContext* context);
|
| + static scoped_ptr<DesktopEnvironment> Create(ChromotingHostContext* context);
|
| + static scoped_ptr<DesktopEnvironment> CreateFake(
|
| + ChromotingHostContext* context,
|
| + scoped_ptr<Capturer> capturer,
|
| + scoped_ptr<protocol::InputStub> event_executor);
|
|
|
| - // DesktopEnvironment takes ownership of all the objects passed in.
|
| - DesktopEnvironment(ChromotingHostContext* context,
|
| - Capturer* capturer,
|
| - EventExecutor* event_executor);
|
| virtual ~DesktopEnvironment();
|
|
|
| void set_host(ChromotingHost* host) { host_ = host; }
|
|
|
| Capturer* capturer() const { return capturer_.get(); }
|
| - EventExecutor* event_executor() const { return event_executor_.get(); }
|
| + protocol::InputStub* event_executor() const { return event_executor_.get(); }
|
|
|
| private:
|
| + DesktopEnvironment(ChromotingHostContext* context,
|
| + scoped_ptr<Capturer> capturer,
|
| + scoped_ptr<protocol::InputStub> event_executor);
|
| +
|
| // The host that owns this DesktopEnvironment.
|
| ChromotingHost* host_;
|
|
|
| @@ -47,7 +54,7 @@ class DesktopEnvironment {
|
| scoped_ptr<Capturer> capturer_;
|
|
|
| // Executes input events received from the client.
|
| - scoped_ptr<EventExecutor> event_executor_;
|
| + scoped_ptr<protocol::InputStub> event_executor_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DesktopEnvironment);
|
| };
|
|
|