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

remoting/host/desktop_session_proxy.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_DESKTOP_SESSION_PROXY_H_
 #define REMOTING_HOST_DESKTOP_SESSION_PROXY_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_platform_file.h"
 #include "remoting/capturer/shared_buffer.h"
 #include "remoting/capturer/video_frame_capturer.h"
+#include "remoting/host/desktop_environment.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "third_party/skia/include/core/SkRegion.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_handle.h"
 #endif
 
 namespace base {
 class SingleThreadTaskRunner;
@@ skipping 11 matching lines @@
 class AudioPacket;
 class ClientSession;
 class IpcAudioCapturer;
 class IpcVideoFrameCapturer;
 
 // This class routes calls to the DesktopEnvironment's stubs though the IPC
 // channel to the DesktopSessionAgent instance running in the desktop
 // integration process.
 class DesktopSessionProxy
     : public base::RefCountedThreadSafe<DesktopSessionProxy>,
+      public DesktopEnvironment,
       public IPC::Listener {
  public:
   DesktopSessionProxy(
-      scoped_refptr<base::SingleThreadTaskRunner> audio_capture_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner);
+      const std::string& client_jid,
+      const base::Closure& disconnect_callback);
+
+  // DesktopEnvironment implementation.
+  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer(
+      scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner) OVERRIDE;
+  virtual scoped_ptr<EventExecutor> CreateEventExecutor(
+      scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) OVERRIDE;
+  virtual scoped_ptr<VideoFrameCapturer> CreateVideoCapturer(
+      scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner) OVERRIDE;
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
-  // Initializes the object. |client_jid| specifies the client session's JID.
-  // |disconnect_callback| specifies a callback that disconnects the client
-  // session when invoked.
-  // Initialize() should be called before AttachToDesktop() is called.
-  void Initialize(const std::string& client_jid,
-                  const base::Closure& disconnect_callback);
-
   // Connects to the desktop session agent.
   bool AttachToDesktop(IPC::PlatformFileForTransit desktop_process,
                        IPC::PlatformFileForTransit desktop_pipe);
 
   // Closes the connection to the desktop session agent and cleans up
   // the associated resources.
   void DetachFromDesktop();
 
   // Disconnects the client session that owns |this|.
   void DisconnectSession();
 
-  // APIs used to implement the VideoFrameCapturer interface. These must be
-  // called on |video_capture_task_runner_|.
-  void InvalidateRegion(const SkRegion& invalid_region);
-  void CaptureFrame();
-
   // Stores |audio_capturer| to be used to post captured audio packets.
   // |audio_capturer| must be valid until StopAudioCapturer() is called.
   void StartAudioCapturer(IpcAudioCapturer* audio_capturer);
 
   // Clears the cached pointer to the audio capturer. Any packets captured after
   // StopAudioCapturer() has been called will be silently dropped.
   void StopAudioCapturer();
 
+  // APIs used to implement the VideoFrameCapturer interface. These must be
+  // called on |video_capture_task_runner_|.
+  void InvalidateRegion(const SkRegion& invalid_region);
+  void CaptureFrame();
+
   // Stores |video_capturer| to be used to post captured video frames.
   // |video_capturer| must be valid until StopVideoCapturer() is called.
   void StartVideoCapturer(IpcVideoFrameCapturer* video_capturer);
 
   // Clears the cached pointer to the video capturer. Any frames captured after
   // StopVideoCapturer() has been called will be silently dropped.
   void StopVideoCapturer();
 
   // APIs used to implement the EventExecutor interface.
   void InjectClipboardEvent(const protocol::ClipboardEvent& event);
@@ skipping 81 matching lines @@
 
   // Points to the video capturer receiving captured video frames.
   IpcVideoFrameCapturer* video_capturer_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopSessionProxy);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_DESKTOP_SESSION_PROXY_H_