Revert 247689 "Use webrtc::MouseCursorMonitor for cursor shapes"

trunk/src/remoting/host/desktop_session_proxy.h

Index: trunk/src/remoting/host/desktop_session_proxy.h
===================================================================
--- trunk/src/remoting/host/desktop_session_proxy.h	(revision 247690)
+++ trunk/src/remoting/host/desktop_session_proxy.h	(working copy)
@@ -31,12 +31,7 @@
 class Message;
 }  // namespace IPC
 
-namespace webrtc {
-class MouseCursor;
-}  // namespace webrtc
-
 struct SerializedDesktopFrame;
-struct SerializedMouseCursor;
 
 namespace remoting {
 
@@ -46,7 +41,6 @@
 class DesktopSessionConnector;
 struct DesktopSessionProxyTraits;
 class IpcAudioCapturer;
-class IpcMouseCursorMonitor;
 class IpcVideoFrameCapturer;
 class ScreenControls;
 
@@ -83,7 +77,6 @@
   scoped_ptr<InputInjector> CreateInputInjector();
   scoped_ptr<ScreenControls> CreateScreenControls();
   scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer();
-  scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor();
   std::string GetCapabilities() const;
   void SetCapabilities(const std::string& capabilities);
 
@@ -116,11 +109,6 @@
   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.
-  void SetMouseCursorMonitor(
-      const base::WeakPtr<IpcMouseCursorMonitor>& mouse_cursor_monitor);
-
   // APIs used to implement the InputInjector interface.
   void InjectClipboardEvent(const protocol::ClipboardEvent& event);
   void InjectKeyEvent(const protocol::KeyEvent& event);
@@ -157,8 +145,8 @@
   // Handles CaptureCompleted notification from the desktop session agent.
   void OnCaptureCompleted(const SerializedDesktopFrame& serialized_frame);
 
-  // Handles MouseCursor notification from the desktop session agent.
-  void OnMouseCursor(const webrtc::MouseCursor& mouse_cursor);
+  // Handles CursorShapeChanged notification from the desktop session agent.
+  void OnCursorShapeChanged(const webrtc::MouseCursorShape& cursor_shape);
 
   // Handles InjectClipboardEvent request from the desktop integration process.
   void OnInjectClipboardEvent(const std::string& serialized_event);
@@ -167,9 +155,9 @@
   // passing |frame|.
   void PostCaptureCompleted(scoped_ptr<webrtc::DesktopFrame> frame);
 
-  // Posts OnMouseCursor() to |mouse_cursor_monitor_| on the video thread,
-  // passing |mouse_cursor|.
-  void PostMouseCursor(scoped_ptr<webrtc::MouseCursor> mouse_cursor);
+  // Posts OnCursorShapeChanged() to |video_capturer_| on the video thread,
+  // passing |cursor_shape|.
+  void PostCursorShape(scoped_ptr<webrtc::MouseCursorShape> cursor_shape);
 
   // Sends a message to the desktop session agent. The message is silently
   // deleted if the channel is broken.
@@ -202,9 +190,6 @@
   // Points to the video capturer receiving captured video frames.
   base::WeakPtr<IpcVideoFrameCapturer> video_capturer_;
 
-  // Points to the mouse cursor monitor receiving mouse cursor changes.
-  base::WeakPtr<IpcMouseCursorMonitor> mouse_cursor_monitor_;
-
   // IPC channel to the desktop session agent.
   scoped_ptr<IPC::ChannelProxy> desktop_channel_;