| Index: remoting/host/client_session.h
|
| diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
|
| index 76e0cbe4436a637aa11af142b4e2bc035e59856d..940ec1a9832f88a8839eec3ea35c4b73338bde98 100644
|
| --- a/remoting/host/client_session.h
|
| +++ b/remoting/host/client_session.h
|
| @@ -14,6 +14,7 @@
|
| #include "base/time/time.h"
|
| #include "base/timer/timer.h"
|
| #include "remoting/host/client_session_control.h"
|
| +#include "remoting/host/gnubby_auth_handler.h"
|
| #include "remoting/host/mouse_clamping_filter.h"
|
| #include "remoting/host/remote_input_filter.h"
|
| #include "remoting/protocol/clipboard_echo_filter.h"
|
| @@ -96,7 +97,8 @@ class ClientSession
|
| scoped_ptr<protocol::ConnectionToClient> connection,
|
| DesktopEnvironmentFactory* desktop_environment_factory,
|
| const base::TimeDelta& max_duration,
|
| - scoped_refptr<protocol::PairingRegistry> pairing_registry);
|
| + scoped_refptr<protocol::PairingRegistry> pairing_registry,
|
| + bool enable_gnubby_auth);
|
| virtual ~ClientSession();
|
|
|
| // protocol::HostStub interface.
|
| @@ -134,6 +136,8 @@ class ClientSession
|
| const webrtc::DesktopVector& position) OVERRIDE;
|
| virtual void SetDisableInputs(bool disable_inputs) OVERRIDE;
|
|
|
| + void SetGnubbyAuthHandlerForTesting(GnubbyAuthHandler* gnubby_auth_handler);
|
| +
|
| protocol::ConnectionToClient* connection() const {
|
| return connection_.get();
|
| }
|
| @@ -233,6 +237,12 @@ class ClientSession
|
| // The pairing registry for PIN-less authentication.
|
| scoped_refptr<protocol::PairingRegistry> pairing_registry_;
|
|
|
| + // True if gnubby auth is enabled.
|
| + bool enable_gnubby_auth_;
|
| +
|
| + // Used to proxy gnubby auth traffic.
|
| + scoped_ptr<GnubbyAuthHandler> gnubby_auth_handler_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ClientSession);
|
| };
|
|
|
|
|