Index: trunk/src/remoting/host/desktop_session_agent.h |
=================================================================== |
--- trunk/src/remoting/host/desktop_session_agent.h (revision 248137) |
+++ trunk/src/remoting/host/desktop_session_agent.h (working copy) |
@@ -18,7 +18,6 @@ |
#include "remoting/host/client_session_control.h" |
#include "remoting/protocol/clipboard_stub.h" |
#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
-#include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h" |
#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" |
namespace IPC { |
@@ -48,7 +47,7 @@ |
: public base::RefCountedThreadSafe<DesktopSessionAgent>, |
public IPC::Listener, |
public webrtc::DesktopCapturer::Callback, |
- public webrtc::MouseCursorMonitor::Callback, |
+ public webrtc::ScreenCapturer::MouseShapeObserver, |
public ClientSessionControl { |
public: |
class Delegate { |
@@ -79,11 +78,9 @@ |
virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE; |
virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE; |
- // webrtc::MouseCursorMonitor::Callback implementation. |
- virtual void OnMouseCursor(webrtc::MouseCursor* cursor) OVERRIDE; |
- virtual void OnMouseCursorPosition( |
- webrtc::MouseCursorMonitor::CursorState state, |
- const webrtc::DesktopVector& position) OVERRIDE; |
+ // webrtc::ScreenCapturer::MouseShapeObserver implementation. |
+ virtual void OnCursorShapeChanged( |
+ webrtc::MouseCursorShape* cursor_shape) OVERRIDE; |
// Forwards a local clipboard event though the IPC channel to the network |
// process. |
@@ -142,13 +139,11 @@ |
// Posted to |audio_capture_task_runner_| to stop the audio capturer. |
void StopAudioCapturer(); |
- // Posted to |video_capture_task_runner_| to start the video capturer and the |
- // mouse cursor monitor. |
- void StartVideoCapturerAndMouseMonitor(); |
+ // Posted to |video_capture_task_runner_| to start the video capturer. |
+ void StartVideoCapturer(); |
- // Posted to |video_capture_task_runner_| to stop the video capturer and the |
- // mouse cursor monitor. |
- void StopVideoCapturerAndMouseMonitor(); |
+ // Posted to |video_capture_task_runner_| to stop the video capturer. |
+ void StopVideoCapturer(); |
private: |
class SharedBuffer; |
@@ -222,9 +217,6 @@ |
// Captures the screen. |
scoped_ptr<webrtc::ScreenCapturer> video_capturer_; |
- // Captures mouse shapes. |
- scoped_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor_; |
- |
// Keep reference to the last frame sent to make sure shared buffer is alive |
// before it's received. |
scoped_ptr<webrtc::DesktopFrame> last_frame_; |