Move ConnectionToClient::EventHandler from ChromotingHost to ClientSession

remoting/host/client_session.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_HOST_CLIENT_SESSION_H_
 #define REMOTING_HOST_CLIENT_SESSION_H_
 
 #include <list>
 #include <set>
 
 #include "base/time.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/input_stub.h"
 #include "third_party/skia/include/core/SkPoint.h"
 
 namespace remoting {
 
 class Capturer;
 
 // A ClientSession keeps a reference to a connection to a client, and maintains
 // per-client state.
 class ClientSession : public protocol::HostStub,
                       public protocol::InputStub,
+                      public protocol::ConnectionToClient::EventHandler,
                       public base::RefCountedThreadSafe<ClientSession> {
  public:
   // Callback interface for passing events to the ChromotingHost.
   class EventHandler {
    public:
     virtual ~EventHandler() {}
 
-    // Called to signal that authentication has succeeded.
-    virtual void OnAuthenticationComplete(
-        scoped_refptr<protocol::ConnectionToClient> client) = 0;
+    virtual void OnSessionAuthenticated(ClientSession* client) = 0;
+    virtual void OnSessionClosed(ClientSession* client) = 0;
+    virtual void OnSessionSequenceNumber(ClientSession* client,
+                                         int64 sequence_number) = 0;
   };
 
   // Takes ownership of |user_authenticator|. Does not take ownership of
   // |event_handler|, |input_stub| or |capturer|.
   ClientSession(EventHandler* event_handler,
                 scoped_refptr<protocol::ConnectionToClient> connection,
                 protocol::InputStub* input_stub,
                 Capturer* capturer);
 
   // protocol::InputStub interface.
   virtual void InjectKeyEvent(const protocol::KeyEvent& event);
   virtual void InjectMouseEvent(const protocol::MouseEvent& event);
 
-  // Notifier called when the client is being disconnected.
-  // This should only be called by ChromotingHost.
-  void OnDisconnected();
+  // protocol::ConnectionToClient::EventHandler interface.
+  virtual void OnConnectionOpened(
+      protocol::ConnectionToClient* connection) OVERRIDE;
+  virtual void OnConnectionClosed(
+      protocol::ConnectionToClient* connection) OVERRIDE;
+  virtual void OnConnectionFailed(
+      protocol::ConnectionToClient* connection) OVERRIDE;
+  virtual void OnSequenceNumberUpdated(
+      protocol::ConnectionToClient* connection, int64 sequence_number) OVERRIDE;
 
-  // Set the authenticated flag.
-  void OnAuthenticationComplete();
+  // Disconnect the session
+  void Disconnect();

[Wez, 2011/11/09 01:35:07]

Clarify the semantics; does this perform the network-level Disconnect?  Does it
trigger OnSessionClosed?  Is the ConnectionToClient valid after it has returned?

[Sergey Ulanov, 2011/11/09 19:26:13]

Done

 
   protocol::ConnectionToClient* connection() const {
     return connection_.get();
   }
 
   bool authenticated() const {
     return authenticated_;
   }
 
   void set_awaiting_continue_approval(bool awaiting) {
@@ skipping 64 matching lines @@
   // Set of keys that are currently pressed down by the user. This is used so
   // we can release them if the user disconnects.
   std::set<int> pressed_keys_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSession);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CLIENT_SESSION_H_