Made DesktopEnvironment responsible for creation of the disconnect window.

remoting/host/desktop_session_agent.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_DESKTOP_SESSION_AGENT_H_
 #define REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
 
 #include <list>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_platform_file.h"
 #include "media/video/capture/screen/screen_capturer.h"
 #include "media/video/capture/screen/shared_buffer.h"
 #include "remoting/host/client_session_control.h"
-#include "remoting/host/ui_strings.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkSize.h"
 
 namespace IPC {
 class ChannelProxy;
 class Message;
 }  // namespace IPC
 
 namespace remoting {
 
 class AudioCapturer;
 class AudioPacket;
 class AutoThreadTaskRunner;
 class DesktopEnvironment;
 class DesktopEnvironmentFactory;
-class DisconnectWindow;
 class InputInjector;
 class RemoteInputFilter;
 class ScreenControls;
 class ScreenResolution;
 
 namespace protocol {
 class InputEventTracker;
 }  // namespace protocol
 
 // Provides screen/audio capturing and input injection services for
@@ skipping 165 matching lines @@
   std::string client_jid_;
 
   // Used to disable callbacks to |this|.
   base::WeakPtrFactory<ClientSessionControl> control_factory_;
 
   base::WeakPtr<Delegate> delegate_;
 
   // The DesktopEnvironment instance used by this agent.
   scoped_ptr<DesktopEnvironment> desktop_environment_;
 
-  // Provides a user interface allowing the local user to close the connection.
-  scoped_ptr<DisconnectWindow> disconnect_window_;
-
   // Executes keyboard, mouse and clipboard events.
   scoped_ptr<InputInjector> input_injector_;
 
   // Tracker used to release pressed keys and buttons when disconnecting.
   scoped_ptr<protocol::InputEventTracker> input_tracker_;
 
   // Filter used to disable remote inputs during local input activity.
   scoped_ptr<RemoteInputFilter> remote_input_filter_;
 
   // Used to apply client-requested changes in screen resolution.
@@ skipping 15 matching lines @@
   // List of the shared buffers.
   typedef std::list<scoped_refptr<media::SharedBuffer> > SharedBuffers;
   SharedBuffers shared_buffers_;
 
   // True if the desktop session agent has been started.
   bool started_;
 
   // Captures the screen.
   scoped_ptr<media::ScreenCapturer> video_capturer_;
 
-  UiStrings ui_strings_;
-
   DISALLOW_COPY_AND_ASSIGN(DesktopSessionAgent);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_DESKTOP_SESSION_AGENT_H_