Refactor IT2Me-specific functions into a HostObserver subclass.

remoting/host/desktop_environment.cc

Index: remoting/host/desktop_environment.cc
diff --git a/remoting/host/desktop_environment.cc b/remoting/host/desktop_environment.cc
index 48db5f114636b775680025326315c45520c3e656..8731d7d4c6c13c96f9ca560a00581641b574ceb2 100644
--- a/remoting/host/desktop_environment.cc
+++ b/remoting/host/desktop_environment.cc
@@ -9,48 +9,20 @@
 #include "remoting/host/capturer.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
-#include "remoting/host/continue_window.h"
 #include "remoting/host/curtain.h"
-#include "remoting/host/disconnect_window.h"
 #include "remoting/host/event_executor.h"
-#include "remoting/host/local_input_monitor.h"
-
-// Milliseconds before the continue window is shown.
-static const int kContinueWindowShowTimeoutMs = 10 * 60 * 1000;
-
-// Milliseconds before the continue window is automatically dismissed and
-// the connection is closed.
-static const int kContinueWindowHideTimeoutMs = 60 * 1000;
 
 namespace remoting {
 
-class DesktopEnvironment::TimerTask {
- public:
-  TimerTask(base::MessageLoopProxy* message_loop,
-            const base::Closure& task,
-            int delay_ms)
-      : thread_proxy_(message_loop) {
-    thread_proxy_.PostDelayedTask(FROM_HERE, task, delay_ms);
-  }
-
- private:
-  ScopedThreadProxy thread_proxy_;
-};
-
 // static
 DesktopEnvironment* DesktopEnvironment::Create(ChromotingHostContext* context) {
   scoped_ptr<Capturer> capturer(Capturer::Create());
   scoped_ptr<EventExecutor> event_executor(
       EventExecutor::Create(context->desktop_message_loop(), capturer.get()));
   scoped_ptr<Curtain> curtain(Curtain::Create());
-  scoped_ptr<DisconnectWindow> disconnect_window(DisconnectWindow::Create());
-  scoped_ptr<ContinueWindow> continue_window(ContinueWindow::Create());
-  scoped_ptr<LocalInputMonitor> local_input_monitor(
-      LocalInputMonitor::Create());
 
   if (capturer.get() == NULL || event_executor.get() == NULL ||
-      curtain.get() == NULL || disconnect_window.get() == NULL ||
-      continue_window.get() == NULL || local_input_monitor.get() == NULL) {
+      curtain.get() == NULL) {
     LOG(ERROR) << "Unable to create DesktopEnvironment";
     return NULL;
   }
@@ -58,155 +30,21 @@ DesktopEnvironment* DesktopEnvironment::Create(ChromotingHostContext* context) {
   return new DesktopEnvironment(context,
                                 capturer.release(),
                                 event_executor.release(),
-                                curtain.release(),
-                                disconnect_window.release(),
-                                continue_window.release(),
-                                local_input_monitor.release());
+                                curtain.release());
 }
 
 DesktopEnvironment::DesktopEnvironment(ChromotingHostContext* context,
                                        Capturer* capturer,
                                        EventExecutor* event_executor,
-                                       Curtain* curtain,
-                                       DisconnectWindow* disconnect_window,
-                                       ContinueWindow* continue_window,
-                                       LocalInputMonitor* local_input_monitor)
+                                       Curtain* curtain)
     : host_(NULL),
       context_(context),
       capturer_(capturer),
       event_executor_(event_executor),
-      curtain_(curtain),
-      disconnect_window_(disconnect_window),
-      continue_window_(continue_window),
-      local_input_monitor_(local_input_monitor),
-      is_monitoring_local_inputs_(false),
-      ui_thread_proxy_(context->ui_message_loop()) {
+      curtain_(curtain) {
 }
 
 DesktopEnvironment::~DesktopEnvironment() {
 }
 
-void DesktopEnvironment::Shutdown() {
-  DCHECK(context_->ui_message_loop()->BelongsToCurrentThread());
-
-  MonitorLocalInputs(false);
-  ShowDisconnectWindow(false, std::string());
-  ShowContinueWindow(false);
-  StartContinueWindowTimer(false);
-
-  ui_thread_proxy_.Detach();
-}
-
-void DesktopEnvironment::OnConnect(const std::string& username) {
-  ui_thread_proxy_.PostTask(FROM_HERE, base::Bind(
-      &DesktopEnvironment::ProcessOnConnect, base::Unretained(this), username));
-}
-
-void DesktopEnvironment::OnLastDisconnect() {
-  ui_thread_proxy_.PostTask(FROM_HERE, base::Bind(
-      &DesktopEnvironment::ProcessOnLastDisconnect, base::Unretained(this)));
-}
-
-void DesktopEnvironment::OnPause(bool pause) {
-}
-
-void DesktopEnvironment::ProcessOnConnect(const std::string& username) {
-  DCHECK(context_->ui_message_loop()->BelongsToCurrentThread());
-
-  MonitorLocalInputs(true);
-  ShowDisconnectWindow(true, username);
-  StartContinueWindowTimer(true);
-}
-
-void DesktopEnvironment::ProcessOnLastDisconnect() {
-  DCHECK(context_->ui_message_loop()->BelongsToCurrentThread());
-
-  MonitorLocalInputs(false);
-  ShowDisconnectWindow(false, std::string());
-  ShowContinueWindow(false);
-  StartContinueWindowTimer(false);
-}
-
-void DesktopEnvironment::MonitorLocalInputs(bool enable) {
-  DCHECK(context_->ui_message_loop()->BelongsToCurrentThread());
-
-  if (enable == is_monitoring_local_inputs_)
-    return;
-  if (enable) {
-    local_input_monitor_->Start(host_);
-  } else {
-    local_input_monitor_->Stop();
-  }
-  is_monitoring_local_inputs_ = enable;
-}
-
-void DesktopEnvironment::ShowDisconnectWindow(bool show,
-                                              const std::string& username) {
-  DCHECK(context_->ui_message_loop()->BelongsToCurrentThread());
-
-  if (show) {
-    disconnect_window_->Show(host_, username);
-  } else {
-    disconnect_window_->Hide();
-  }
-}
-
-void DesktopEnvironment::ShowContinueWindow(bool show) {
-  DCHECK(context_->ui_message_loop()->BelongsToCurrentThread());
-
-  if (show) {
-    continue_window_->Show(host_, base::Bind(
-        &DesktopEnvironment::ContinueSession, base::Unretained(this)));
-  } else {
-    continue_window_->Hide();
-  }
-}
-
-void DesktopEnvironment::ContinueSession(bool continue_session) {
-  DCHECK(context_->ui_message_loop()->BelongsToCurrentThread());
-
-  if (continue_session) {
-    host_->PauseSession(false);
-    timer_task_.reset();
-    StartContinueWindowTimer(true);
-  } else {
-    host_->Shutdown(base::Closure());
-  }
-}
-
-void DesktopEnvironment::StartContinueWindowTimer(bool start) {
-  DCHECK(context_->ui_message_loop()->BelongsToCurrentThread());
-
-  if (start) {
-    timer_task_.reset(new TimerTask(
-        context_->ui_message_loop(),
-        base::Bind(&DesktopEnvironment::OnContinueWindowTimer,
-                   base::Unretained(this)),
-        kContinueWindowShowTimeoutMs));
-  } else if (!start) {
-    timer_task_.reset();
-  }
-
-}
-
-void DesktopEnvironment::OnContinueWindowTimer() {
-  DCHECK(context_->ui_message_loop()->BelongsToCurrentThread());
-
-  host_->PauseSession(true);
-  ShowContinueWindow(true);
-
-  timer_task_.reset(new TimerTask(
-      context_->ui_message_loop(),
-      base::Bind(&DesktopEnvironment::OnShutdownHostTimer,
-                 base::Unretained(this)),
-      kContinueWindowHideTimeoutMs));
-}
-
-void DesktopEnvironment::OnShutdownHostTimer() {
-  DCHECK(context_->ui_message_loop()->BelongsToCurrentThread());
-
-  ShowContinueWindow(false);
-  host_->Shutdown(base::Closure());
-}
-
 }  // namespace remoting