Made DesktopEnvironment responsible for creation of the disconnect window.

remoting/host/basic_desktop_environment.h

 // 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.
 
 #ifndef REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_
 #define REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "remoting/host/desktop_environment.h"
+#include "remoting/host/ui_strings.h"
 
 namespace remoting {
 
+class HostWindow;
 class LocalInputMonitor;
 
 // Used to create audio/video capturers and event executor that work with
 // the local console.
 class BasicDesktopEnvironment : public DesktopEnvironment {
  public:
   virtual ~BasicDesktopEnvironment();
 
   // DesktopEnvironment implementation.
   virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE;
   virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
   virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
   virtual scoped_ptr<media::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
 
  protected:
   friend class BasicDesktopEnvironmentFactory;
+
+  // |ui_strings| are hosted by the BasicDesktopEnvironmentFactory instance that
+  // created |this|. |ui_strings| must outlive this object.
   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);

[Sergey Ulanov, 2013/04/02 19:04:22]

Maybe just copy ui_strings, to avoid worrying about object lifetime? it's small.

[alexeypa (please no reviews), 2013/04/03 20:26:43]

Done.

 
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const {
     return caller_task_runner_;
   }
 
   scoped_refptr<base::SingleThreadTaskRunner> input_task_runner() const {
     return input_task_runner_;
   }
 
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner() const {
     return ui_task_runner_;
   }
 
+  const UiStrings* ui_strings() const { return ui_strings_; }

[Sergey Ulanov, 2013/04/02 19:04:22]

nit: return const ref here?

[Sergey Ulanov, 2013/04/02 19:04:22]

is this method used anywhere?

[alexeypa (please no reviews), 2013/04/03 20:26:43]

I removed this code.

+
  private:
   // Task runner on which methods of DesktopEnvironment interface should be
   // called.
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
 
   // Used to run input-related tasks.
   scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
 
   // Used to run UI code.
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
 
+  // Presents the disconnect window to the local user.
+  scoped_ptr<HostWindow> disconnect_window_;
+
   // Notifies the client session about the local mouse movements.
   scoped_ptr<LocalInputMonitor> local_input_monitor_;
 
+  // Points to the localized UI strings.
+  const UiStrings* ui_strings_;
+
   DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironment);
 };
 
 // Used to create |BasicDesktopEnvironment| instances.
 class BasicDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
  public:
   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);
   virtual ~BasicDesktopEnvironmentFactory();
 
   // DesktopEnvironmentFactory implementation.
   virtual scoped_ptr<DesktopEnvironment> Create(
       base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
   virtual bool SupportsAudioCapture() const OVERRIDE;
 
  protected:
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const {
     return caller_task_runner_;
   }
 
   scoped_refptr<base::SingleThreadTaskRunner> input_task_runner() const {
     return input_task_runner_;
   }
 
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner() const {
     return ui_task_runner_;
   }
 
+  const UiStrings& ui_strings() const { return ui_strings_; }
+
  private:
   // Task runner on which methods of DesktopEnvironmentFactory interface should
   // be called.
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
 
   // Used to run input-related tasks.
   scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
 
   // Used to run UI code.
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
 
+  // Contains a copy of the localized UI strings.
+  const UiStrings ui_strings_;
+
   DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironmentFactory);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_