Index: remoting/host/ipc_video_frame_capturer.h |
diff --git a/remoting/host/ipc_video_frame_capturer.h b/remoting/host/ipc_video_frame_capturer.h |
index ba5c51784d03c0d96590f009453d6f22a1073b75..681361b921ac2660623ec4d070367f324366d876 100644 |
--- a/remoting/host/ipc_video_frame_capturer.h |
+++ b/remoting/host/ipc_video_frame_capturer.h |
@@ -6,26 +6,29 @@ |
#define REMOTING_HOST_IPC_VIDEO_FRAME_CAPTURER_H_ |
#include "base/memory/ref_counted.h" |
-#include "remoting/capturer/video_frame_capturer.h" |
+#include "media/video/capture/screen/screen_capturer.h" |
namespace IPC { |
class Message; |
} // namespace IPC |
+namespace media { |
+struct MouseCursorShape; |
+} // namespace media |
+ |
namespace remoting { |
class DesktopSessionProxy; |
-struct MouseCursorShape; |
-// Routes VideoFrameCapturer calls though the IPC channel to the desktop session |
-// agent running in the desktop integration process. |
-class IpcVideoFrameCapturer : public VideoFrameCapturer { |
+// Routes media::ScreenCapturer calls though the IPC channel to the desktop |
+// session agent running in the desktop integration process. |
+class IpcVideoFrameCapturer : public media::ScreenCapturer { |
public: |
explicit IpcVideoFrameCapturer( |
scoped_refptr<DesktopSessionProxy> desktop_session_proxy); |
virtual ~IpcVideoFrameCapturer(); |
- // VideoFrameCapturer interface. |
+ // media::ScreenCapturer interface. |
virtual void Start(Delegate* delegate) OVERRIDE; |
virtual void Stop() OVERRIDE; |
virtual void InvalidateRegion(const SkRegion& invalid_region) OVERRIDE; |
@@ -33,14 +36,14 @@ class IpcVideoFrameCapturer : public VideoFrameCapturer { |
// Called when a video frame has been captured. |capture_data| describes |
// a captured frame. |
- void OnCaptureCompleted(scoped_refptr<CaptureData> capture_data); |
+ void OnCaptureCompleted(scoped_refptr<media::ScreenCaptureData> capture_data); |
// Called when the cursor shape has changed. |
- void OnCursorShapeChanged(scoped_ptr<MouseCursorShape> cursor_shape); |
+ void OnCursorShapeChanged(scoped_ptr<media::MouseCursorShape> cursor_shape); |
private: |
- // Points to the delegate passed to VideoFrameCapturer::Start(). |
- VideoFrameCapturer::Delegate* delegate_; |
+ // Points to the delegate passed to media::ScreenCapturer::Start(). |
+ media::ScreenCapturer::Delegate* delegate_; |
// Wraps the IPC channel to the desktop session agent. |
scoped_refptr<DesktopSessionProxy> desktop_session_proxy_; |