Use webrtc::MouseCursorMonitor for cursor shapes

remoting/host/basic_desktop_environment.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_BASIC_DESKTOP_ENVIRONMENT_H_
 #define REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/host/desktop_environment.h"
 
+namespace webrtc {
+
+class DesktopCaptureOptions;
+
+}  // namespace webrtc
+
 namespace remoting {
 
 // Used to create audio/video capturers and event executor that work with
 // the local console.
 class BasicDesktopEnvironment : public DesktopEnvironment {
  public:
   virtual ~BasicDesktopEnvironment();
 
   // DesktopEnvironment implementation.
   virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE;
   virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
   virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
   virtual scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
+  virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
+      OVERRIDE;
   virtual std::string GetCapabilities() const OVERRIDE;
   virtual void SetCapabilities(const std::string& capabilities) OVERRIDE;
 
  protected:
   friend class BasicDesktopEnvironmentFactory;
 
   BasicDesktopEnvironment(
       scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
 
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const {
     return caller_task_runner_;
   }
 
   scoped_refptr<base::SingleThreadTaskRunner> input_task_runner() const {
     return input_task_runner_;
   }
 
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner() const {
     return ui_task_runner_;
   }
 
+  webrtc::DesktopCaptureOptions* desktop_capture_options() {

[Sergey Ulanov, 2014/01/28 20:35:07]

nit: I think it's better to return const reference here to make it clear that
BasicDesktopEnvironment owns DesktopCaptureOptions and it should not be mutated.

[dcaiafa, 2014/01/28 22:36:29]

Me2MeDesktopEnvironment must be able to change it (it calls
set_use_update_notifications). That was actually the reason for adding the
accessor.

On 2014/01/28 20:35:07, Sergey Ulanov wrote:

+    return desktop_capture_options_.get();
+  }
+
  private:
   // Task runner on which methods of DesktopEnvironment interface should be
   // called.
   scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
 
   // Used to run input-related tasks.
   scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
 
   // Used to run UI code.
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
 
+  // Options shared between |ScreenCapturer| and |MouseCursorMonitor|. It
+  // might contain expensive resources, thus justifying the sharing.
+  // Also: it's dynamically allocated to avoid having to bring in
+  // desktop_capture_options.h which brings in X11 headers which causes hard to
+  // find build errors.
+  scoped_ptr<webrtc::DesktopCaptureOptions> desktop_capture_options_;
+
   DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironment);
 };
 
 // Used to create |BasicDesktopEnvironment| instances.
 class BasicDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
  public:
   BasicDesktopEnvironmentFactory(
       scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
@@ skipping 25 matching lines @@
 
   // Used to run UI code.
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironmentFactory);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_BASIC_DESKTOP_ENVIRONMENT_H_