| Index: remoting/host/me2me_desktop_environment.h
|
| diff --git a/remoting/host/me2me_desktop_environment.h b/remoting/host/me2me_desktop_environment.h
|
| index f028664463c9346d91990b783f6509a667cc349e..9ee69a96f9ad55844272b6f19eceeb81d33a3d4f 100644
|
| --- a/remoting/host/me2me_desktop_environment.h
|
| +++ b/remoting/host/me2me_desktop_environment.h
|
| @@ -23,6 +23,8 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
|
| virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
|
| virtual scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
|
| virtual std::string GetCapabilities() const OVERRIDE;
|
| + virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(
|
| + protocol::ClientStub* client_stub) OVERRIDE;
|
|
|
| protected:
|
| friend class Me2MeDesktopEnvironmentFactory;
|
| @@ -37,6 +39,8 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
|
| base::WeakPtr<ClientSessionControl> client_session_control,
|
| bool curtain_enabled);
|
|
|
| + void SetEnableGnubbyAuth(bool gnubby_auth_enabled);
|
| +
|
| private:
|
| // "Curtains" the session making sure it is disconnected from the local
|
| // console.
|
| @@ -48,6 +52,9 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
|
| // Notifies the client session about the local mouse movements.
|
| scoped_ptr<LocalInputMonitor> local_input_monitor_;
|
|
|
| + // True if gnubby auth is enabled.
|
| + bool gnubby_auth_enabled_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironment);
|
| };
|
|
|
| @@ -64,6 +71,7 @@ class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
|
| virtual scoped_ptr<DesktopEnvironment> Create(
|
| base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
|
| virtual void SetEnableCurtaining(bool enable) OVERRIDE;
|
| + virtual void SetEnableGnubbyAuth(bool enable) OVERRIDE;
|
|
|
| protected:
|
| bool curtain_enabled() const { return curtain_enabled_; }
|
| @@ -72,6 +80,9 @@ class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
|
| // True if curtain mode is enabled.
|
| bool curtain_enabled_;
|
|
|
| + // True if gnubby auth is enabled.
|
| + bool gnubby_auth_enabled_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironmentFactory);
|
| };
|
|
|
|
|