Add HostObserverInterface and decouple HeartbeatSender and ChromotingHost.

remoting/host/chromoting_host.cc

 // 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.
 
 #include "remoting/host/chromoting_host.h"
 
 #include "build/build_config.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/encoder.h"
 #include "remoting/base/encoder_row_based.h"
@@ skipping 89 matching lines @@
   // Connect to the talk network with a JingleClient.
   signal_strategy_.reset(
       new XmppSignalStrategy(context_->jingle_thread(), xmpp_login,
                              xmpp_auth_token,
                              kChromotingTokenServiceName));
   jingle_client_ = new JingleClient(context_->jingle_thread(),
                                     signal_strategy_.get(),
                                     NULL,
                                     this);
   jingle_client_->Init();
-
-  heartbeat_sender_ =
-      new HeartbeatSender(context_->jingle_thread()->message_loop(),
-                          jingle_client_.get(), config_);
-  if (!heartbeat_sender_->Init()) {
-    LOG(ERROR) << "Failed to initialize HeartbeatSender.";
-    return;
-  }
 }
 
 // This method is called when we need to destroy the host process.
 void ChromotingHost::Shutdown() {
   if (MessageLoop::current() != context_->main_message_loop()) {
     context_->main_message_loop()->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &ChromotingHost::Shutdown));
     return;
   }
@@ skipping 12 matching lines @@
   if (recorder_.get()) {
     recorder_->RemoveAllConnections();
   }
 
   // Disconnect the clients.
   for (size_t i = 0; i < clients_.size(); i++) {
     clients_[i]->Disconnect();
   }
   clients_.clear();
 
-  // Stop the heartbeat sender.
-  if (heartbeat_sender_) {
-    heartbeat_sender_->Stop();
+  // Notify observers.
+  for (StatusObserverList::iterator it = status_observers_.begin();
+       it != status_observers_.end(); ++it) {
+    (*it)->OnShutdown();
   }
 
   // Stop chromotocol session manager.
   if (session_manager_) {
     session_manager_->Close(
         NewRunnableMethod(this, &ChromotingHost::OnServerClosed));
   }
 
   // Disconnect from the talk network.
   if (jingle_client_) {
     jingle_client_->Close();
   }
 
   if (recorder_.get()) {
     recorder_->Stop(shutdown_task_.release());
   } else {
     shutdown_task_->Run();
     shutdown_task_.reset();
   }
 }
 
+void ChromotingHost::AddStatusObserver(
+    const scoped_refptr<HostStatusObserver>& observer) {
+  DCHECK_EQ(state_, kInitial);
+  status_observers_.push_back(observer);
+}
+
 ////////////////////////////////////////////////////////////////////////////
 // protocol::ConnectionToClient::EventHandler implementations
 void ChromotingHost::OnConnectionOpened(ConnectionToClient* connection) {
   DCHECK_EQ(context_->network_message_loop(), MessageLoop::current());
   VLOG(1) << "Connection to client established.";
 }
 
 void ChromotingHost::OnConnectionClosed(ConnectionToClient* connection) {
   DCHECK_EQ(context_->network_message_loop(), MessageLoop::current());
 
@@ skipping 12 matching lines @@
       FROM_HERE,
       NewRunnableMethod(this, &ChromotingHost::OnClientDisconnected,
                         make_scoped_refptr(connection)));
 }
 
 ////////////////////////////////////////////////////////////////////////////
 // JingleClient::Callback implementations
 void ChromotingHost::OnStateChange(JingleClient* jingle_client,
                                    JingleClient::State state) {
   if (state == JingleClient::CONNECTED) {
+    std::string jid = jingle_client->GetFullJid();
+
     DCHECK_EQ(jingle_client_.get(), jingle_client);
-    VLOG(1) << "Host connected as " << jingle_client->GetFullJid();
+    VLOG(1) << "Host connected as " << jid;
 
     // Create and start session manager.
     protocol::JingleSessionManager* server =
         new protocol::JingleSessionManager(context_->jingle_thread());
+    // TODO(ajwong): Make this a command switch when we're more stable.
+    server->set_allow_local_ips(true);
 
     // Assign key and certificate to server.
     HostKeyPair key_pair;
     CHECK(key_pair.Load(config_))
         << "Failed to load server authentication data";
 
-    // TODO(ajwong): Make this a command switch when we're more stable.
-    server->set_allow_local_ips(true);
-    server->Init(jingle_client->GetFullJid(),
-                 jingle_client->session_manager(),
+    server->Init(jid, jingle_client->session_manager(),
                  NewCallback(this, &ChromotingHost::OnNewClientSession),
-                 key_pair.CopyPrivateKey(),
-                 key_pair.GenerateCertificate());
+                 key_pair.CopyPrivateKey(), key_pair.GenerateCertificate());
 
     session_manager_ = server;
-    // Start heartbeating.
-    heartbeat_sender_->Start();
+
+    for (StatusObserverList::iterator it = status_observers_.begin();
+         it != status_observers_.end(); ++it) {
+      (*it)->OnSignallingConnected(signal_strategy_.get(), jid);
+    }
   } else if (state == JingleClient::CLOSED) {
     VLOG(1) << "Host disconnected from talk network.";
 
-    // Stop heartbeating.
-    heartbeat_sender_->Stop();
-
+    for (StatusObserverList::iterator it = status_observers_.begin();
+         it != status_observers_.end(); ++it) {
+      (*it)->OnSignallingDisconnected();
+    }
     // TODO(sergeyu): We should try reconnecting here instead of terminating
     // the host.
     Shutdown();
   }
 }
 
 void ChromotingHost::OnNewClientSession(
     protocol::Session* session,
     protocol::SessionManager::IncomingSessionResponse* response) {
   base::AutoLock auto_lock(lock_);
@@ skipping 58 matching lines @@
 }
 
 void ChromotingHost::OnServerClosed() {
   // Don't need to do anything here.
 }
 
 void ChromotingHost::OnClientDisconnected(ConnectionToClient* connection) {
   DCHECK_EQ(context_->main_message_loop(), MessageLoop::current());
 
   // Find the client session corresponding to the given connection.
-  std::vector<scoped_refptr<ClientSession> >::iterator client;
-  for (client = clients_.begin(); client != clients_.end(); ++client) {
+  ClientList::iterator client;
+  for (client = clients_.begin(); client != clients_.end();
+       ++client) {
     if (client->get()->connection() == connection)
       break;
   }
   if (client == clients_.end())
     return;
 
   // Remove the connection from the session manager and stop the session.
   // TODO(hclam): Stop only if the last connection disconnected.
   if (recorder_.get()) {
     recorder_->RemoveConnection(connection);
@@ skipping 34 matching lines @@
   return NULL;
 }
 
 std::string ChromotingHost::GenerateHostAuthToken(
     const std::string& encoded_client_token) {
   // TODO(ajwong): Return the signature of this instead.
   return encoded_client_token;
 }
 
 bool ChromotingHost::HasAuthenticatedClients() const {
-  std::vector<scoped_refptr<ClientSession> >::const_iterator it;
-  for (it = clients_.begin(); it != clients_.end(); ++it) {
+  for (ClientList::const_iterator it = clients_.begin(); it != clients_.end();
+       ++it) {
     if (it->get()->authenticated())
       return true;
   }
   return false;
 }
 
 void ChromotingHost::EnableCurtainMode(bool enable) {
   // TODO(jamiewalch): This will need to be more sophisticated when we think
   // about proper crash recovery and daemon mode.
   if (enable == is_curtained_)
@@ skipping 14 matching lines @@
   }
 
   protocol::LocalLoginStatus* status = new protocol::LocalLoginStatus();
   status->set_success(true);
   connection->client_stub()->BeginSessionResponse(
       status, new DeleteTask<protocol::LocalLoginStatus>(status));
 
   // Disconnect all other clients.
   // Iterate over a copy of the list of clients, to avoid mutating the list
   // while iterating over it.
-  std::vector<scoped_refptr<ClientSession> > clients_copy(clients_);
-  std::vector<scoped_refptr<ClientSession> >::const_iterator client;
-  for (client = clients_copy.begin(); client != clients_copy.end(); client++) {
+  ClientList clients_copy(clients_);
+  for (ClientList::const_iterator client = clients_copy.begin();
+       client != clients_copy.end(); client++) {
     ConnectionToClient* connection_other = client->get()->connection();
     if (connection_other != connection) {
       OnClientDisconnected(connection_other);
     }
   }
   // Those disconnections should have killed the screen recorder.
   CHECK(recorder_.get() == NULL);
 
   // Create a new RecordSession if there was none.
   if (!recorder_.get()) {
@@ skipping 23 matching lines @@
     return;
   }
 
   protocol::LocalLoginStatus* status = new protocol::LocalLoginStatus();
   status->set_success(false);
   connection->client_stub()->BeginSessionResponse(
       status, new DeleteTask<protocol::LocalLoginStatus>(status));
 }
 
 }  // namespace remoting