Add HostObserverInterface and decouple HeartbeatSender and ChromotingHost.

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/heartbeat_sender.h"
+#include "remoting/host/host_status_observer.h"
 #include "remoting/jingle_glue/jingle_client.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 #include "remoting/protocol/session_manager.h"
 #include "remoting/protocol/connection_to_client.h"
 
 class Task;
 
 namespace remoting {
 
 namespace protocol {
@@ skipping 54 matching lines @@
   //
   // |shutdown_task| is called if Start() has failed ot Shutdown() is called
   // and all related operations are completed.
   //
   // This method can only be called once during the lifetime of this object.
   void Start(Task* shutdown_task);
 
   // Asynchronously shutdown the host process.
   void Shutdown();
 
+  void AddStatusObserver(const scoped_refptr<HostStatusObserver>& observer);
+
   ////////////////////////////////////////////////////////////////////////////
   // protocol::ConnectionToClient::EventHandler implementations
   virtual void OnConnectionOpened(protocol::ConnectionToClient* client);
   virtual void OnConnectionClosed(protocol::ConnectionToClient* client);
   virtual void OnConnectionFailed(protocol::ConnectionToClient* client);
 
   ////////////////////////////////////////////////////////////////////////////
   // JingleClient::Callback implementations
   virtual void OnStateChange(JingleClient* client, JingleClient::State state);
 
@@ skipping 10 matching lines @@
       protocol::SessionManager::IncomingSessionResponse* response);
 
   // 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);
 
  private:
   friend class base::RefCountedThreadSafe<ChromotingHost>;
   friend class ChromotingHostTest;
 
+  typedef std::vector<scoped_refptr<HostStatusObserver> > StatusObserverList;
+  typedef std::vector<scoped_refptr<ClientSession> > ClientList;
+
   ChromotingHost(ChromotingHostContext* context, MutableHostConfig* config,
                  DesktopEnvironment* environment);
   virtual ~ChromotingHost();
 
   enum State {
     kInitial,
     kStarted,
     kStopped,
   };
 
@@ skipping 20 matching lines @@
   scoped_ptr<DesktopEnvironment> desktop_environment_;
 
   scoped_ptr<SignalStrategy> signal_strategy_;
 
   // The libjingle client. This is used to connect to the talk network to
   // receive connection requests from chromoting client.
   scoped_refptr<JingleClient> jingle_client_;
 
   scoped_refptr<protocol::SessionManager> session_manager_;
 
-  // Objects that takes care of sending heartbeats to the chromoting bot.
-  scoped_refptr<HeartbeatSender> heartbeat_sender_;
+  StatusObserverList status_observers_;
 
   AccessVerifier access_verifier_;
 
   // The connections to remote clients.
-  std::vector<scoped_refptr<ClientSession> > clients_;
+  ClientList clients_;
 
   // Session manager for the host process.
   scoped_refptr<ScreenRecorder> recorder_;
 
   // This task gets executed when this object fails to connect to the
   // talk network or Shutdown() is called.
   scoped_ptr<Task> shutdown_task_;
 
   // Tracks the internal state of the host.
   // This variable is written on the main thread of ChromotingHostContext
   // and read by jingle thread.
   State state_;
 
   // Lock is to lock the access to |state_|.
   base::Lock lock_;
 
   // Configuration of the protocol.
   scoped_ptr<protocol::CandidateSessionConfig> protocol_config_;
 
   // Whether or not the host is currently curtained.
   bool is_curtained_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_