Made DesktopEnvironment responsible for creation of the disconnect window.

remoting/host/basic_desktop_environment.cc

Index: remoting/host/basic_desktop_environment.cc
diff --git a/remoting/host/basic_desktop_environment.cc b/remoting/host/basic_desktop_environment.cc
index 21d6600a10c5a91cb0a5593d9e10ec7108975a0a..63ea05e2a09f4807a413b220c50b7bfbe00e44d4 100644
--- a/remoting/host/basic_desktop_environment.cc
+++ b/remoting/host/basic_desktop_environment.cc
@@ -4,14 +4,17 @@
 
 #include "remoting/host/basic_desktop_environment.h"
 
+#include "base/bind.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "media/video/capture/screen/screen_capturer.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/client_session_control.h"
+#include "remoting/host/host_window.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/host/local_input_monitor.h"
 #include "remoting/host/screen_controls.h"
+#include "remoting/host/ui_strings.h"
 
 namespace remoting {
 
@@ -50,10 +53,12 @@ BasicDesktopEnvironment::BasicDesktopEnvironment(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
-    base::WeakPtr<ClientSessionControl> client_session_control)
+    base::WeakPtr<ClientSessionControl> client_session_control,
+    const UiStrings* ui_strings)
     : caller_task_runner_(caller_task_runner),
       input_task_runner_(input_task_runner),
-      ui_task_runner_(ui_task_runner) {
+      ui_task_runner_(ui_task_runner),
+      ui_strings_(ui_strings) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   // Create the local input monitor.
@@ -61,15 +66,28 @@ BasicDesktopEnvironment::BasicDesktopEnvironment(
                                                    input_task_runner_,
                                                    ui_task_runner_,
                                                    client_session_control);
+
+  // Create the disconnect window.
+  std::string client_jid = client_session_control->client_jid();
+  std::string username = client_jid.substr(0, client_jid.find('/'));
+  disconnect_window_ = HostWindow::CreateDisconnectWindow(
+      caller_task_runner_,
+      ui_task_runner_,
+      base::Bind(&ClientSessionControl::DisconnectSession,
+                 client_session_control),
+      username,
+      *ui_strings_);
 }
 
 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
+    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
+    const UiStrings& ui_strings)
     : caller_task_runner_(caller_task_runner),
       input_task_runner_(input_task_runner),
-      ui_task_runner_(ui_task_runner) {
+      ui_task_runner_(ui_task_runner),
+      ui_strings_(ui_strings) {
 }
 
 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() {
@@ -83,7 +101,8 @@ scoped_ptr<DesktopEnvironment> BasicDesktopEnvironmentFactory::Create(
       new BasicDesktopEnvironment(caller_task_runner(),
                                   input_task_runner(),
                                   ui_task_runner(),
-                                  client_session_control));
+                                  client_session_control,
+                                  &ui_strings_));
 }
 
 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const {