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 8d6b90ac231f4479c291d7f1ce9e5ed6d042cff0..e76ff2387dc3ccbccf06025c6c2b46960290de20 100644 |
--- a/remoting/host/ipc_video_frame_capturer.h |
+++ b/remoting/host/ipc_video_frame_capturer.h |
@@ -29,20 +29,25 @@ class IpcVideoFrameCapturer : public media::ScreenCapturer { |
scoped_refptr<DesktopSessionProxy> desktop_session_proxy); |
virtual ~IpcVideoFrameCapturer(); |
+ // webrtc::DesktopCapturer interface. |
+ virtual void Start(Callback* callback) OVERRIDE; |
+ virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE; |
+ |
// media::ScreenCapturer interface. |
- virtual void Start(Delegate* delegate) OVERRIDE; |
- virtual void CaptureFrame() OVERRIDE; |
+ virtual void SetMouseShapeObserver( |
+ MouseShapeObserver* mouse_shape_observer) OVERRIDE; |
- // Called when a video frame has been captured. |capture_data| describes |
- // a captured frame. |
- void OnCaptureCompleted(scoped_refptr<media::ScreenCaptureData> capture_data); |
+ // Called when a video |frame| has been captured. |
+ void OnCaptureCompleted(scoped_ptr<webrtc::DesktopFrame> frame); |
// Called when the cursor shape has changed. |
void OnCursorShapeChanged(scoped_ptr<media::MouseCursorShape> cursor_shape); |
private: |
- // Points to the delegate passed to media::ScreenCapturer::Start(). |
- media::ScreenCapturer::Delegate* delegate_; |
+ // Points to the callback passed to media::ScreenCapturer::Start(). |
+ media::ScreenCapturer::Callback* callback_; |
+ |
+ MouseShapeObserver* mouse_shape_observer_; |
// Wraps the IPC channel to the desktop session agent. |
scoped_refptr<DesktopSessionProxy> desktop_session_proxy_; |