Made DesktopEnvironment responsible for creation of the disconnect window.

remoting/host/win/session_desktop_environment.cc

Index: remoting/host/win/session_desktop_environment.cc
diff --git a/remoting/host/win/session_desktop_environment.cc b/remoting/host/win/session_desktop_environment.cc
index 934436c35bb16de580c10fd1627d109e9b810af8..8f314efca6bbc870a92d802a21d482196f0d4133 100644
--- a/remoting/host/win/session_desktop_environment.cc
+++ b/remoting/host/win/session_desktop_environment.cc
@@ -14,19 +14,6 @@
 
 namespace remoting {
 
-SessionDesktopEnvironment::SessionDesktopEnvironment(
-    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,
-    const base::Closure& inject_sas)
-    : Me2MeDesktopEnvironment(caller_task_runner,
-                              input_task_runner,
-                              ui_task_runner,
-                              client_session_control),
-      inject_sas_(inject_sas) {
-}
-
 SessionDesktopEnvironment::~SessionDesktopEnvironment() {
 }
 
@@ -42,14 +29,31 @@ scoped_ptr<InputInjector> SessionDesktopEnvironment::CreateInputInjector() {
   return input_injector.Pass();
 }
 
+SessionDesktopEnvironment::SessionDesktopEnvironment(
+    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,
+    const UiStrings* ui_strings,
+    const base::Closure& inject_sas)
+    : Me2MeDesktopEnvironment(caller_task_runner,
+                              input_task_runner,
+                              ui_task_runner,
+                              client_session_control,
+                              ui_strings),
+      inject_sas_(inject_sas) {
+}
+
 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
+    const UiStrings& ui_strings,
     const base::Closure& inject_sas)
     : Me2MeDesktopEnvironmentFactory(caller_task_runner,
                                      input_task_runner,
-                                     ui_task_runner),
+                                     ui_task_runner,
+                                     ui_strings),
       inject_sas_(inject_sas) {
   DCHECK(caller_task_runner->BelongsToCurrentThread());
 }
@@ -66,6 +70,7 @@ scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create(
                                     input_task_runner(),
                                     ui_task_runner(),
                                     client_session_control,
+                                    &ui_strings(),
                                     inject_sas_));
 }