Made DesktopEnvironment responsible for creation of the disconnect window.

remoting/host/desktop_session_agent.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/desktop_session_agent.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/video/capture/screen/screen_capture_data.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/desktop_environment.h"
-#include "remoting/host/disconnect_window.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/host/remote_input_filter.h"
 #include "remoting/host/screen_controls.h"
 #include "remoting/host/screen_resolution.h"
 #include "remoting/proto/audio.pb.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/input_event_tracker.h"
 #include "third_party/skia/include/core/SkRegion.h"
@@ skipping 33 matching lines @@
 }
 
 }  // namespace
 
 DesktopSessionAgent::Delegate::~Delegate() {
 }
 
 DesktopSessionAgent::~DesktopSessionAgent() {
   DCHECK(!audio_capturer_);
   DCHECK(!desktop_environment_);
-  DCHECK(!disconnect_window_);
   DCHECK(!network_channel_);
   DCHECK(!screen_controls_);
   DCHECK(!video_capturer_);
 
   CloseDesktopPipeHandle();
 }
 
 bool DesktopSessionAgent::OnMessageReceived(const IPC::Message& message) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
@@ skipping 104 matching lines @@
   NOTREACHED();
 }
 
 void DesktopSessionAgent::OnStartSessionAgent(
     const std::string& authenticated_jid,
     const ScreenResolution& resolution) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
   DCHECK(!started_);
   DCHECK(!audio_capturer_);
   DCHECK(!desktop_environment_);
-  DCHECK(!disconnect_window_);
   DCHECK(!input_injector_);
   DCHECK(!screen_controls_);
   DCHECK(!video_capturer_);
 
   started_ = true;
   client_jid_ = authenticated_jid;
 
   // Create a desktop environment for the new session.
   desktop_environment_ = delegate_->desktop_environment_factory().Create(
       control_factory_.GetWeakPtr());
@@ skipping 13 matching lines @@
   // LocalInputMonitorWin filters out an echo of the injected input before it
   // reaches |remote_input_filter_|.
   remote_input_filter_->SetExpectLocalEcho(false);
 #endif  // defined(OS_WIN)
 
   // Start the input injector.
   scoped_ptr<protocol::ClipboardStub> clipboard_stub(
       new DesktopSesssionClipboardStub(this));
   input_injector_->Start(clipboard_stub.Pass());
 
-  // Create the disconnect window.
-  disconnect_window_ = DisconnectWindow::Create(&ui_strings_);
-  disconnect_window_->Show(
-      base::Bind(&DesktopSessionAgent::DisconnectSession, this),
-      authenticated_jid.substr(0, authenticated_jid.find('/')));
-
   // Start the audio capturer.
   if (delegate_->desktop_environment_factory().SupportsAudioCapture()) {
     audio_capturer_ = desktop_environment_->CreateAudioCapturer();
     audio_capture_task_runner()->PostTask(
         FROM_HERE, base::Bind(&DesktopSessionAgent::StartAudioCapturer, this));
   }
 
   // Start the video capturer.
   video_capturer_ = desktop_environment_->CreateVideoCapturer();
   video_capture_task_runner()->PostTask(
@@ skipping 74 matching lines @@
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   delegate_.reset();
 
   // Make sure the channel is closed.
   network_channel_.reset();
 
   if (started_) {
     started_ = false;
 
-    // Close the disconnect window and stop listening to local input.
-    disconnect_window_->Hide();
-    disconnect_window_.reset();
-
     // Ignore any further callbacks.
     control_factory_.InvalidateWeakPtrs();
     client_jid_.clear();
 
     remote_input_filter_.reset();
 
     // Ensure that any pressed keys or buttons are released.
     input_tracker_->ReleaseAll();
     input_tracker_.reset();
 
@@ skipping 205 matching lines @@
     base::ClosePlatformFile(desktop_pipe_.fd);
 #else  // !defined(OS_POSIX)
 #error Unsupported platform.
 #endif  // !defined(OS_POSIX)
 
     desktop_pipe_ = IPC::InvalidPlatformFileForTransit();
   }
 }
 
 }  // namespace remoting