Move ConnectionToClient::EventHandler from ChromotingHost to ClientSession

remoting/host/chromoting_host.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_CHROMOTING_HOST_H_
 #define REMOTING_CHROMOTING_HOST_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "remoting/base/encoder.h"
 #include "remoting/host/access_verifier.h"
 #include "remoting/host/capturer.h"
 #include "remoting/host/client_session.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_status_observer.h"
 #include "remoting/host/ui_strings.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/protocol/session_manager.h"
 #include "remoting/protocol/connection_to_client.h"
 
 class Task;
 
 namespace remoting {
 
 namespace protocol {
-class ConnectionToClient;
 class HostStub;
 class InputStub;
 class SessionConfig;
 class CandidateSessionConfig;
 }  // namespace protocol
 
 class Capturer;
 class ChromotingHostContext;
 class DesktopEnvironment;
 class Encoder;
@@ skipping 17 matching lines @@
 //    client.
 //    After we have done all the initialization we'll start the ScreenRecorder.
 //    We'll then enter the running state of the host process.
 //
 // 3. When the user is disconnected, we will pause the ScreenRecorder
 //    and try to terminate the threads we have created. This will allow
 //    all pending tasks to complete. After all of that completed we
 //    return to the idle state. We then go to step (2) if there a new
 //    incoming connection.
 class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
-                       public protocol::ConnectionToClient::EventHandler,
                        public ClientSession::EventHandler,
                        public SignalStrategy::StatusObserver,
                        public protocol::SessionManager::Listener {
  public:
   // Factory methods that must be used to create ChromotingHost
   // instances.  Returned instance takes ownership of
   // |access_verifier|. It does NOT take ownership of |context|,
   // and |environment|, but they should not be deleted until
   // returned host is destroyed.
   static ChromotingHost* Create(ChromotingHostContext* context,
@@ skipping 14 matching lines @@
   // called after shutdown is completed.
   void Shutdown(Task* shutdown_task);
 
   // Adds |observer| to the list of status observers. Doesn't take
   // ownership of |observer|, so |observer| must outlive this
   // object. All status observers must be added before the host is
   // started.
   void AddStatusObserver(HostStatusObserver* observer);
 
   ////////////////////////////////////////////////////////////////////////////
-  // protocol::ConnectionToClient::EventHandler implementation.
-  // TODO(sergeyu): Move this to ClientSession.
-  virtual void OnConnectionOpened(protocol::ConnectionToClient* client);
-  virtual void OnConnectionClosed(protocol::ConnectionToClient* client);
-  virtual void OnConnectionFailed(protocol::ConnectionToClient* client);
-  virtual void OnSequenceNumberUpdated(protocol::ConnectionToClient* client,
-                                       int64 sequence_number);
-
-  ////////////////////////////////////////////////////////////////////////////
   // SignalStrategy::StatusObserver implementation.
   virtual void OnStateChange(
       SignalStrategy::StatusObserver::State state) OVERRIDE;
   virtual void OnJidChange(const std::string& full_jid) OVERRIDE;
 
   ////////////////////////////////////////////////////////////////////////////
   // ClientSession::EventHandler implementation.
-  virtual void OnAuthenticationComplete(
-      scoped_refptr<protocol::ConnectionToClient> client);
+  virtual void OnSessionAuthenticated(ClientSession* client) OVERRIDE;
+  virtual void OnSessionClosed(ClientSession* session) OVERRIDE;
+  virtual void OnSessionSequenceNumber(ClientSession* session,
+                                       int64 sequence_number) OVERRIDE;
 
   // SessionManager::Listener implementation.
   virtual void OnSessionManagerInitialized() OVERRIDE;
   virtual void OnIncomingSession(
       protocol::Session* session,
       protocol::SessionManager::IncomingSessionResponse* response) OVERRIDE;
 
-  void AddAuthenticatedClient(
-      scoped_refptr<protocol::ConnectionToClient> connection,
-      const protocol::SessionConfig& config,
-      const std::string& jid);
+  void AddAuthenticatedClient(ClientSession* client,

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

Does this belong in the public interface, since it's an implementation detail of
OnSessionAuthenticated?

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

Made it private. I either case I removed this method in the next CL.

+                              const protocol::SessionConfig& config,
+                              const std::string& jid);
 
   // Sets desired configuration for the protocol. Ownership of the
   // |config| is transferred to the object. Must be called before Start().
   void set_protocol_config(protocol::CandidateSessionConfig* config);
 
   // TODO(wez): ChromotingHost shouldn't need to know about Me2Mom.
   void set_it2me(bool is_it2me) {
     is_it2me_ = is_it2me;
   }
   void set_access_code(const std::string& access_code) {
@@ skipping 30 matching lines @@
   // Takes ownership of |access_verifier|, and adds a reference to
   // |config|. Caller keeps ownership of |context| and |environment|.
   ChromotingHost(ChromotingHostContext* context,
                  MutableHostConfig* config,
                  DesktopEnvironment* environment,
                  AccessVerifier* access_verifier,
                  bool allow_nat_traversal);
   virtual ~ChromotingHost();
 
   // This method is called if a client is disconnected from the host.
-  void OnClientDisconnected(protocol::ConnectionToClient* client);
+  void OnClientDisconnected(ClientSession* client);

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

nit: Perhaps it would be clearer to call this OnSessionDisconnected, since
"Client" refers to the same thing as "Session" in the
ClientSession::EventHandler interface, above?

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

This method is removed in the next CL.

 
   // Creates encoder for the specified configuration.
   Encoder* CreateEncoder(const protocol::SessionConfig& config);
 
   std::string GenerateHostAuthToken(const std::string& encoded_client_token);
 
   int AuthenticatedClientsCount() const;
 
   void EnableCurtainMode(bool enable);
 
-  void ProcessPreAuthentication(
-      const scoped_refptr<protocol::ConnectionToClient>& connection);
-
   void StopScreenRecorder();
   void OnScreenRecorderStopped();
 
   // The following methods are called during shutdown.
   void ShutdownNetwork();
   void ShutdownRecorder();
   void ShutdownFinish();
 
   // Parameters specified when the host was created.
   ChromotingHostContext* context_;
@@ skipping 45 matching lines @@
   std::vector<Task*> shutdown_tasks_;
 
   UiStrings ui_strings_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_