[Chromoting] Request the daemon to open a terminal once a connection has been accepted.

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.h"
 #include "remoting/host/desktop_environment_factory.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;
@@ skipping 275 matching lines @@
     *response = protocol::SessionManager::INCOMPATIBLE;
     return;
   }
 
   session->set_config(config);
 
   *response = protocol::SessionManager::ACCEPT;
 
   LOG(INFO) << "Client connected: " << session->jid();
 
-  // Create the desktop integration implementation for the client to use.
-  scoped_ptr<DesktopEnvironment> desktop_environment =
-      desktop_environment_factory_->Create();
-
   // Create a client object.
   scoped_ptr<protocol::ConnectionToClient> connection(
       new protocol::ConnectionToClient(session));
   scoped_refptr<ClientSession> client = new ClientSession(
       this,
       capture_task_runner_,
       encode_task_runner_,
       network_task_runner_,
       connection.Pass(),
-      desktop_environment.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);
@@ skipping 34 matching lines @@
     return;
   }
 
   while (!clients_.empty()) {
     size_t size = clients_.size();
     clients_.front()->Disconnect();
     CHECK_EQ(clients_.size(), size - 1);
   }
 }
 
+void ChromotingHost::DisconnectClient(DesktopEnvironment* desktop_environment) {
+  DCHECK(network_task_runner_->BelongsToCurrentThread());
+
+  for (ClientList::iterator i = clients_.begin(); i != clients_.end(); ++i) {
+    if ((*i)->desktop_environment() == desktop_environment) {
+      (*i)->Disconnect();
+      break;
+    }
+  }
+}
+
 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());
 
@@ skipping 25 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