Chromoting: Move host input and window mgmt into DesktopEnvironment

remoting/host/chromoting_host.h

 // Copyright (c) 2011 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_CHROMOTING_HOST_H_
 #define REMOTING_CHROMOTING_HOST_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
-#include "base/timer.h"
 #include "remoting/base/encoder.h"
 #include "remoting/host/access_verifier.h"
 #include "remoting/host/capturer.h"
 #include "remoting/host/client_session.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_status_observer.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/protocol/session_manager.h"
 #include "remoting/protocol/connection_to_client.h"
@@ skipping 145 matching lines @@
 
   // Creates encoder for the specified configuration.
   Encoder* CreateEncoder(const protocol::SessionConfig* config);
 
   std::string GenerateHostAuthToken(const std::string& encoded_client_token);
 
   int AuthenticatedClientsCount() const;
 
   void EnableCurtainMode(bool enable);
 
-  void MonitorLocalInputs(bool enable);
-
   void ProcessPreAuthentication(
       const scoped_refptr<protocol::ConnectionToClient>& connection);
 
-  // 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);
-
-  void StartContinueWindowTimer(bool start);
-
-  void ContinueWindowTimerFunc();
-
   // The following methods are called during shutdown.
   void ShutdownRecorder();
   void ShutdownFinish();
 
   // The context that the chromoting host runs on.
   ChromotingHostContext* context_;
 
   scoped_refptr<MutableHostConfig> config_;
 
   scoped_ptr<DesktopEnvironment> desktop_environment_;

[Sergey Ulanov, 2011/07/07 00:33:17]

scoped_refptr?

[garykac, 2011/07/07 20:38:09]

not needed (I removed refcounting).

 
   scoped_ptr<SignalStrategy> signal_strategy_;
 
   std::string local_jid_;
 
   scoped_ptr<protocol::SessionManager> session_manager_;
 
   StatusObserverList status_observers_;
 
   scoped_ptr<AccessVerifier> access_verifier_;
 
   // The connections to remote clients.
   ClientList clients_;
 
   // Session manager for the host process.
   scoped_refptr<ScreenRecorder> recorder_;
 
   // Tracks the internal state of the host.
   // This variable is written on the main thread of ChromotingHostContext
   // and read by jingle thread.
   State state_;
 
   // Lock is to lock the access to |state_|.
   base::Lock lock_;
 
   // Configuration of the protocol.
   scoped_ptr<protocol::CandidateSessionConfig> protocol_config_;
 
   bool is_curtained_;
-  bool is_monitoring_local_inputs_;
-
-  // Timer controlling the "continue session" dialog. The timer is started when
-  // a connection is made or re-confirmed. On expiry, inputs to the host are
-  // blocked and the dialog is shown.
-  base::OneShotTimer<ChromotingHost> continue_window_timer_;
 
   // Whether or not the host is running in "IT2Me" mode, in which connections
   // are pre-authenticated, and hence the local login challenge can be bypassed.
   bool is_it2me_;
 
   // Stores list of tasks that should be executed when we finish
   // shutdown. Used only while |state_| is set to kStopping.
   std::vector<Task*> shutdown_tasks_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_