Switch DesktopEnvironment to return a DesktopCapturer.

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"
@@ skipping 18 matching lines @@
 namespace IPC {
 class ChannelProxy;
 class Message;
 }  // namespace IPC
 
 namespace webrtc {
 class MouseCursor;
 }  // namespace webrtc
 
 struct SerializedDesktopFrame;
-struct SerializedMouseCursor;
 
 namespace remoting {
 
 class AudioPacket;
 class ClientSession;
 class ClientSessionControl;
 class DesktopSessionConnector;
 struct DesktopSessionProxyTraits;
 class IpcAudioCapturer;
 class IpcMouseCursorMonitor;
@@ skipping 25 matching lines @@
       scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
       base::WeakPtr<ClientSessionControl> client_session_control,
       base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
       bool virtual_terminal);
 
   // Mirrors DesktopEnvironment.
   scoped_ptr<AudioCapturer> CreateAudioCapturer();
   scoped_ptr<InputInjector> CreateInputInjector();
   scoped_ptr<ScreenControls> CreateScreenControls();
-  scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer();
+  scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer();
   scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor();
   std::string GetCapabilities() const;
   void SetCapabilities(const std::string& capabilities);
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
   // Connects to the desktop session agent.
   bool AttachToDesktop(base::ProcessHandle 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();
 
   // Stores |audio_capturer| to be used to post captured audio packets. Called
   // on the |audio_capture_task_runner_| thread.
   void SetAudioCapturer(const base::WeakPtr<IpcAudioCapturer>& audio_capturer);
 
-  // APIs used to implement the webrtc::ScreenCapturer interface. These must be
+  // APIs used to implement the webrtc::DesktopCapturer interface. These must be
   // called on the |video_capture_task_runner_| thread.
   void CaptureFrame();
 
   // Stores |video_capturer| to be used to post captured video frames. Called on
   // the |video_capture_task_runner_| thread.
   void SetVideoCapturer(
       const base::WeakPtr<IpcVideoFrameCapturer> video_capturer);
 
   // Stores |mouse_cursor_monitor| to be used to post mouse cursor changes.
   // Called on the |video_capture_task_runner_| thread.
@@ skipping 110 matching lines @@
 };
 
 // Destroys |DesktopSessionProxy| instances on the caller's thread.
 struct DesktopSessionProxyTraits {
   static void Destruct(const DesktopSessionProxy* desktop_session_proxy);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_DESKTOP_SESSION_PROXY_H_