Making DesktopEnvironment a factory class used by ClientSession to create audio/video capturers and…

remoting/host/chromoting_host.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "build/build_config.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/chromoting_host_context.h"
-#include "remoting/host/desktop_environment_factory.h"
+#include "remoting/host/desktop_environment.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/host/host_config.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/input_stub.h"
 #include "remoting/protocol/session_config.h"
 
 using remoting::protocol::ConnectionToClient;
 using remoting::protocol::InputStub;
@@ skipping 28 matching lines @@
   false,
 };
 
 }  // namespace
 
 ChromotingHost::ChromotingHost(
     SignalStrategy* signal_strategy,
     DesktopEnvironmentFactory* desktop_environment_factory,
     scoped_ptr<protocol::SessionManager> session_manager,
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
+    scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
     : desktop_environment_factory_(desktop_environment_factory),
       session_manager_(session_manager.Pass()),
       audio_task_runner_(audio_task_runner),
+      input_task_runner_(input_task_runner),
       video_capture_task_runner_(video_capture_task_runner),
       video_encode_task_runner_(video_encode_task_runner),
       network_task_runner_(network_task_runner),
+      ui_task_runner_(ui_task_runner),
       signal_strategy_(signal_strategy),
-      clients_count_(0),
       state_(kInitial),
       protocol_config_(protocol::CandidateSessionConfig::CreateDefault()),
       login_backoff_(&kDefaultBackoffPolicy),
       authenticating_client_(false),
       reject_authenticating_client_(false) {
   DCHECK(signal_strategy);
   DCHECK(network_task_runner_->BelongsToCurrentThread());
 
   if (!desktop_environment_factory_->SupportsAudioCapture()) {
     protocol::CandidateSessionConfig::DisableAudioChannel(
@@ skipping 49 matching lines @@
       if (!shutdown_task.is_null())
         shutdown_tasks_.push_back(shutdown_task);
       state_ = kStopping;
 
       // Disconnect all of the clients.
       while (!clients_.empty()) {
         clients_.front()->Disconnect();
       }
 
       // Run the remaining shutdown tasks.
-      if (state_ == kStopping && !clients_count_)
+      if (state_ == kStopping)
         ShutdownFinish();
 
       break;
   }
 }
 
 void ChromotingHost::AddStatusObserver(HostStatusObserver* observer) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   status_observers_.AddObserver(observer);
 }
@@ skipping 80 matching lines @@
       break;
     }
   }
   CHECK(it != clients_.end());
 
   if (client->is_authenticated()) {
     FOR_EACH_OBSERVER(HostStatusObserver, status_observers_,
                       OnClientDisconnected(client->client_jid()));
   }
 
-  client->Stop(base::Bind(&ChromotingHost::OnClientStopped, this));
+  client->Stop();
   clients_.erase(it);
+
+  if (state_ == kStopping && clients_.empty())
+    ShutdownFinish();
 }
 
 void ChromotingHost::OnSessionSequenceNumber(ClientSession* session,
                                              int64 sequence_number) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
 }
 
 void ChromotingHost::OnSessionRouteChange(
     ClientSession* session,
     const std::string& channel_name,
@@ skipping 51 matching lines @@
   *response = protocol::SessionManager::ACCEPT;
 
   LOG(INFO) << "Client connected: " << session->jid();
 
   // Create a client object.
   scoped_ptr<protocol::ConnectionToClient> connection(
       new protocol::ConnectionToClient(session));
   scoped_refptr<ClientSession> client = new ClientSession(
       this,
       audio_task_runner_,
+      input_task_runner_,
       video_capture_task_runner_,
       video_encode_task_runner_,
       network_task_runner_,
+      ui_task_runner_,
       connection.Pass(),
       desktop_environment_factory_,
       max_session_duration_);
   clients_.push_back(client);
-  clients_count_++;
 }
 
 void ChromotingHost::set_protocol_config(
     scoped_ptr<protocol::CandidateSessionConfig> config) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   DCHECK(config.get());
   DCHECK_EQ(state_, kInitial);
   protocol_config_ = config.Pass();
 }
 
@@ skipping 38 matching lines @@
   }
 }
 
 void ChromotingHost::SetUiStrings(const UiStrings& ui_strings) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kInitial);
 
   ui_strings_ = ui_strings;
 }
 
-void ChromotingHost::OnClientStopped() {
-  DCHECK(network_task_runner_->BelongsToCurrentThread());
-
-  --clients_count_;
-  if (state_ == kStopping && !clients_count_)
-    ShutdownFinish();
-}
-
 void ChromotingHost::ShutdownFinish() {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kStopping);
 
   state_ = kStopped;
 
   // Destroy session manager.
   session_manager_.reset();
 
   // Clear |desktop_environment_factory_| and |signal_strategy_| to
@@ skipping 10 matching lines @@
                     OnShutdown());
 
   for (std::vector<base::Closure>::iterator it = shutdown_tasks_.begin();
        it != shutdown_tasks_.end(); ++it) {
     it->Run();
   }
   shutdown_tasks_.clear();
 }
 
 }  // namespace remoting