[Chromoting] Refactoring DesktopEnvironment and moving screen/audio recorders to ClientSession.

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>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
 #include "net/base/backoff_entry.h"
 #include "remoting/base/encoder.h"
 #include "remoting/host/client_session.h"
-#include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_key_pair.h"
 #include "remoting/host/host_status_observer.h"
 #include "remoting/host/mouse_move_observer.h"
 #include "remoting/host/ui_strings.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/session_manager.h"
 #include "remoting/protocol/connection_to_client.h"
 
 namespace remoting {
 
 namespace protocol {
 class InputStub;
 class SessionConfig;
 class CandidateSessionConfig;
 }  // namespace protocol
 
-class AudioEncoder;
-class AudioScheduler;
 class ChromotingHostContext;
-class DesktopEnvironment;
-class Encoder;
-class ScreenRecorder;
-class VideoFrameCapturer;
+class DesktopEnvironmentFactory;
 
 // A class to implement the functionality of a host process.
 //
 // Here's the work flow of this class:
 // 1. We should load the saved GAIA ID token or if this is the first
 //    time the host process runs we should prompt user for the
 //    credential. We will use this token or credentials to authenicate
 //    and register the host.
 //
 // 2. We listen for incoming connection using libjingle. We will create
@@ skipping 11 matching lines @@
 //    all pending tasks to complete. After all of that completed we
 //    return to the idle state. We then go to step (2) if there a new
 //    incoming connection.
 class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
                        public ClientSession::EventHandler,
                        public protocol::SessionManager::Listener,
                        public MouseMoveObserver {
  public:
   // The caller must ensure that |context|, |signal_strategy| and
   // |environment| out-live the host.
-  ChromotingHost(ChromotingHostContext* context,
-                 SignalStrategy* signal_strategy,
-                 DesktopEnvironment* environment,
-                 scoped_ptr<protocol::SessionManager> session_manager);
+  ChromotingHost(
+      ChromotingHostContext* context,
+      SignalStrategy* signal_strategy,
+      DesktopEnvironmentFactory* desktop_environment_factory,
+      scoped_ptr<protocol::SessionManager> session_manager);
 
   // 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();
 
   // Asynchronously shutdown the host process. |shutdown_task| is
@@ skipping 70 matching lines @@
 
   typedef std::vector<ClientSession*> ClientList;
 
   enum State {
     kInitial,
     kStarted,
     kStopping,
     kStopped,
   };
 
-  // Creates encoder for the specified configuration.
-  static Encoder* CreateEncoder(const protocol::SessionConfig& config);
-
-  // Creates an audio encoder for the specified configuration.
-  static scoped_ptr<AudioEncoder> CreateAudioEncoder(
-      const protocol::SessionConfig& config);
-
   virtual ~ChromotingHost();
 
-  void StopScreenRecorder();
-  void StopAudioScheduler();
-  void OnRecorderStopped();
-
-  // Called from Shutdown() or OnScreenRecorderStopped() to finish shutdown.
+  // 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.
   ChromotingHostContext* context_;
-  DesktopEnvironment* desktop_environment_;
+  DesktopEnvironmentFactory* desktop_environment_factory_;
   scoped_ptr<protocol::SessionManager> session_manager_;
 
   // Connection objects.
   SignalStrategy* signal_strategy_;
 
   // Must be used on the network thread only.
   ObserverList<HostStatusObserver> status_observers_;
 
   // The connections to remote clients.
   ClientList clients_;
 
-  // Schedulers for audio and video capture.
-  // TODO(sergeyu): Do we need to have one set of schedulers per client?
-  scoped_refptr<ScreenRecorder> recorder_;
-  scoped_refptr<AudioScheduler> audio_scheduler_;
-
-  // Number of screen recorders and audio schedulers that are currently being
-  // stopped. Used to delay shutdown if one or more recorders/schedulers are
-  // asynchronously shutting down.
-  int stopping_recorders_;
-
   // 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_