Refactor IT2Me-specific functions into a HostObserver subclass.

remoting/host/desktop_environment.h

Index: remoting/host/desktop_environment.h
diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h
index 28da047e1f227931e2598eb3284cd55ca3763aaf..06fcf74714f7d4422bca808edccda0b184c5315c 100644
--- a/remoting/host/desktop_environment.h
+++ b/remoting/host/desktop_environment.h
@@ -18,11 +18,8 @@ namespace remoting {
 class Capturer;
 class ChromotingHost;
 class ChromotingHostContext;
-class ContinueWindow;
 class Curtain;
-class DisconnectWindow;
 class EventExecutor;
-class LocalInputMonitor;
 
 class DesktopEnvironment {
  public:
@@ -32,57 +29,16 @@ class DesktopEnvironment {
   DesktopEnvironment(ChromotingHostContext* context,
                      Capturer* capturer,
                      EventExecutor* event_executor,
-                     Curtain* curtain,
-                     DisconnectWindow* disconnect_window,
-                     ContinueWindow* continue_window,
-                     LocalInputMonitor* monitor);
+                     Curtain* curtain);
   virtual ~DesktopEnvironment();
 
-  // Shuts down the object and all its resources synchronously. Must
-  // be called on the UI thread.
-  void Shutdown();
-
   void set_host(ChromotingHost* host) { host_ = host; }
 
   Capturer* capturer() const { return capturer_.get(); }
   EventExecutor* event_executor() const { return event_executor_.get(); }
   Curtain* curtain() const { return curtain_.get(); }

[Sergey Ulanov, 2011/11/29 20:18:00]

Do we want curtain to be part of DesktopEnvironment or should it also be moved
to the new class?

[Lambros, 2011/11/30 20:47:02]

Will eventually move to a Me2Me-specific HostObserver class.  For now, removed
curtain from DesktopEnv + ChromotingHost.

 
-  // Called whenever a new client has connected.
-  void OnConnect(const std::string& username);
-
-  // Called when the last client has disconnected.
-  void OnLastDisconnect();
-
-  // Called when the remote connection has been paused/unpaused.
-  void OnPause(bool pause);
-
  private:
-  class TimerTask;
-
-  void ProcessOnConnect(const std::string& username);
-  void ProcessOnLastDisconnect();
-
-  void MonitorLocalInputs(bool enable);
-
-  // Show or hide the Disconnect window on the UI thread.  If |show| is false,
-  // hide the window, ignoring the |username| parameter.
-  void ShowDisconnectWindow(bool show, const std::string& username);
-
-  // Show or hide the Continue Sharing window on the UI thread.
-  void ShowContinueWindow(bool show);
-
-  // Called by the ContinueWindow implementation (on the UI thread) when the
-  // user dismisses the Continue prompt.
-  // TODO(lambroslambrou): Move this method to the (to be written)
-  // It2MeObserver class.
-  void ContinueSession(bool continue_session);
-
-  void StartContinueWindowTimer(bool start);
-
-  void OnContinueWindowTimer();
-  void OnShutdownHostTimer();
-
   // The host that owns this DesktopEnvironment.
   ChromotingHost* host_;
 
@@ -99,24 +55,6 @@ class DesktopEnvironment {
   // Curtain ensures privacy for the remote user.
   scoped_ptr<Curtain> curtain_;
 
-  // Provide a user interface allowing the host user to close the connection.
-  scoped_ptr<DisconnectWindow> disconnect_window_;
-
-  // Provide a user interface requiring the user to periodically re-confirm
-  // the connection.
-  scoped_ptr<ContinueWindow> continue_window_;
-
-  // Monitor local inputs to allow remote inputs to be blocked while the local
-  // user is trying to do something.
-  scoped_ptr<LocalInputMonitor> local_input_monitor_;
-
-  bool is_monitoring_local_inputs_;
-
-  // Timer controlling the "continue session" dialog.
-  scoped_ptr<TimerTask> timer_task_;
-
-  ScopedThreadProxy ui_thread_proxy_;
-
   DISALLOW_COPY_AND_ASSIGN(DesktopEnvironment);
 };