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

trunk/src/remoting/host/desktop_session_agent.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_AGENT_H_
 #define REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_platform_file.h"
 #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 {
 class ChannelProxy;
 class Message;
 }  // namespace IPC
 
 namespace remoting {
 
 class AudioCapturer;
 class AudioPacket;
 class AutoThreadTaskRunner;
 class DesktopEnvironment;
 class DesktopEnvironmentFactory;
 class InputInjector;
 class RemoteInputFilter;
 class ScreenControls;
 class ScreenResolution;
 
 namespace protocol {
 class InputEventTracker;
 }  // namespace protocol
 
 // Provides screen/audio capturing and input injection services for
 // the network process.
 class DesktopSessionAgent
     : public base::RefCountedThreadSafe<DesktopSessionAgent>,
       public IPC::Listener,
       public webrtc::DesktopCapturer::Callback,
-      public webrtc::MouseCursorMonitor::Callback,
+      public webrtc::ScreenCapturer::MouseShapeObserver,
       public ClientSessionControl {
  public:
   class Delegate {
    public:
     virtual ~Delegate();
 
     // Returns an instance of desktop environment factory used.
     virtual DesktopEnvironmentFactory& desktop_environment_factory() = 0;
 
     // Notifies the delegate that the network-to-desktop channel has been
@@ skipping 10 matching lines @@
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
   // webrtc::DesktopCapturer::Callback implementation.
   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.
   void InjectClipboardEvent(const protocol::ClipboardEvent& event);
 
   // Forwards an audio packet though the IPC channel to the network process.
   void ProcessAudioPacket(scoped_ptr<AudioPacket> packet);
 
   // Creates desktop integration components and a connected IPC channel to be
   // used to access them. The client end of the channel is returned in
@@ skipping 38 matching lines @@
 
   // Sends a message to the network process.
   void SendToNetwork(IPC::Message* message);
 
   // Posted to |audio_capture_task_runner_| to start the audio capturer.
   void StartAudioCapturer();
 
   // 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;
   friend class SharedBuffer;
 
   // Called by SharedBuffer when it's destroyed.
   void OnSharedBufferDeleted(int id);
 
   // Closes |desktop_pipe_| if it is open.
   void CloseDesktopPipeHandle();
@@ skipping 53 matching lines @@
 
   // The number of currently allocated shared buffers.
   int shared_buffers_;
 
   // True if the desktop session agent has been started.
   bool started_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopSessionAgent);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_DESKTOP_SESSION_AGENT_H_