Use webrtc::MouseCursorMonitor for cursor shapes

remoting/host/basic_desktop_environment.cc

Index: remoting/host/basic_desktop_environment.cc
diff --git a/remoting/host/basic_desktop_environment.cc b/remoting/host/basic_desktop_environment.cc
index 7698ca8a9853ca385f510b5b9900343dc0da01b1..8df54c58335023005175c329d66c64ec01e9a0d4 100644
--- a/remoting/host/basic_desktop_environment.cc
+++ b/remoting/host/basic_desktop_environment.cc
@@ -11,6 +11,8 @@
 #include "remoting/host/client_session_control.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/host/screen_controls.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
+#include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 
 namespace remoting {
@@ -37,6 +39,13 @@ scoped_ptr<ScreenControls> BasicDesktopEnvironment::CreateScreenControls() {
   return scoped_ptr<ScreenControls>();
 }
 
+scoped_ptr<webrtc::MouseCursorMonitor>
+BasicDesktopEnvironment::CreateMouseCursorMonitor() {
+  return scoped_ptr<webrtc::MouseCursorMonitor>(
+      webrtc::MouseCursorMonitor::CreateForScreen(
+          webrtc::DesktopCaptureOptions::CreateDefault()));

[Sergey Ulanov, 2013/12/03 21:47:28]

DesktopCaptureOptions::CreateDefault() creates a new X11 connection for X11
builds. Ideally we want to reuse the same connection that's used by the screen
capturer. Can you please create DesktopCaptureOptions instance in constructor
and then use it here and in CreateVideoCapturer()?

[dcaiafa, 2013/12/10 01:32:03]

Done.

+}
+
 std::string BasicDesktopEnvironment::GetCapabilities() const {
   return std::string();
 }