Making DesktopEnvironment a factory class used by ClientSession to create audio/video capturers and…

remoting/host/chromoting_host.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_CHROMOTING_HOST_H_
 #define REMOTING_HOST_CHROMOTING_HOST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 55 matching lines @@
                        public MouseMoveObserver {
  public:
   // The caller must ensure that |signal_strategy| and
   // |desktop_environment_factory| remain valid at least until the
   // |shutdown_task| supplied to Shutdown() has been notified.
   ChromotingHost(
       SignalStrategy* signal_strategy,
       DesktopEnvironmentFactory* desktop_environment_factory,
       scoped_ptr<protocol::SessionManager> session_manager,
       scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> network_task_runner);
+      scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
 
   // Asynchronously start the host process.
   //
   // After this is invoked, the host process will connect to the talk
   // network and start listening for incoming connections.
   //
   // This method can only be called once during the lifetime of this object.
   void Start(const std::string& xmpp_login);
 
   // Asynchronously shutdown the host process. |shutdown_task| is
@@ skipping 73 matching lines @@
 
   enum State {
     kInitial,
     kStarted,
     kStopping,
     kStopped,
   };
 
   virtual ~ChromotingHost();
 
-  // Called when a client session is stopped completely.
-  void OnClientStopped();
-
   // Called from Shutdown() to finish shutdown.
   void ShutdownFinish();
 
   // Unless specified otherwise all members of this class must be
   // used on the network thread only.
 
   // Parameters specified when the host was created.
   DesktopEnvironmentFactory* desktop_environment_factory_;
   scoped_ptr<protocol::SessionManager> session_manager_;
   scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
 
   // Connection objects.
   SignalStrategy* signal_strategy_;
 
   // Must be used on the network thread only.
   ObserverList<HostStatusObserver> status_observers_;
 
   // The connections to remote clients.
   ClientList clients_;
 
-  // The number of allocated |ClientSession| objects. |clients_count_| can be
-  // greater than |clients_.size()| because it also includes the objects that
-  // are about to be deleted.
-  int clients_count_;
-
   // Tracks the internal state of the host.
   State state_;
 
   // Configuration of the protocol.
   scoped_ptr<protocol::CandidateSessionConfig> protocol_config_;
 
   // Login backoff state.
   net::BackoffEntry login_backoff_;
 
   // Flags used for RejectAuthenticatingClient().
@@ skipping 10 matching lines @@
 
   // The maximum duration of any session.
   base::TimeDelta max_session_duration_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_