| Index: remoting/host/client_session.h
|
| diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
|
| index 013dc5727bc71776c6cc0b8be4116fedf70c345d..cfc1fe62d12c04051d33ea4328df9ba2f8b0640a 100644
|
| --- a/remoting/host/client_session.h
|
| +++ b/remoting/host/client_session.h
|
| @@ -17,7 +17,6 @@
|
| namespace remoting {
|
|
|
| class Capturer;
|
| -class UserAuthenticator;
|
|
|
| // A ClientSession keeps a reference to a connection to a client, and maintains
|
| // per-client state.
|
| @@ -30,29 +29,18 @@ class ClientSession : public protocol::HostStub,
|
| public:
|
| virtual ~EventHandler() {}
|
|
|
| - // Called to signal that local login has succeeded and ChromotingHost can
|
| - // proceed with the next step.
|
| - virtual void LocalLoginSucceeded(
|
| - scoped_refptr<protocol::ConnectionToClient> client) = 0;
|
| -
|
| - // Called to signal that local login has failed.
|
| - virtual void LocalLoginFailed(
|
| + // Called to signal that authentication has succeeded.
|
| + virtual void OnAuthenticationComplete(
|
| scoped_refptr<protocol::ConnectionToClient> client) = 0;
|
| };
|
|
|
| // Takes ownership of |user_authenticator|. Does not take ownership of
|
| // |event_handler|, |input_stub| or |capturer|.
|
| ClientSession(EventHandler* event_handler,
|
| - UserAuthenticator* user_authenticator,
|
| scoped_refptr<protocol::ConnectionToClient> connection,
|
| protocol::InputStub* input_stub,
|
| Capturer* capturer);
|
|
|
| - // protocol::HostStub interface.
|
| - virtual void BeginSessionRequest(
|
| - const protocol::LocalLoginCredentials* credentials,
|
| - const base::Closure& done);
|
| -
|
| // protocol::InputStub interface.
|
| virtual void InjectKeyEvent(const protocol::KeyEvent& event);
|
| virtual void InjectMouseEvent(const protocol::MouseEvent& event);
|
| @@ -61,8 +49,8 @@ class ClientSession : public protocol::HostStub,
|
| // This should only be called by ChromotingHost.
|
| void OnDisconnected();
|
|
|
| - // Set the authenticated flag or log a failure message as appropriate.
|
| - void OnAuthorizationComplete(bool success);
|
| + // Set the authenticated flag.
|
| + void OnAuthenticationComplete();
|
|
|
| protocol::ConnectionToClient* connection() const {
|
| return connection_.get();
|
| @@ -102,9 +90,6 @@ class ClientSession : public protocol::HostStub,
|
|
|
| EventHandler* event_handler_;
|
|
|
| - // A factory for user authenticators.
|
| - scoped_ptr<UserAuthenticator> user_authenticator_;
|
| -
|
| // The connection to the client.
|
| scoped_refptr<protocol::ConnectionToClient> connection_;
|
|
|
|
|