Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: remoting/host/basic_desktop_environment.h

Issue 92473002: Use webrtc::MouseCursorMonitor for cursor shapes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed obsolete #include. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/host/basic_desktop_environment.cc » ('j') | remoting/host/chromoting_param_traits.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/basic_desktop_environment.h
diff --git a/remoting/host/basic_desktop_environment.h b/remoting/host/basic_desktop_environment.h
index dbc9822be3564c2b852bb14f03531113464dce4f..ba4485387e4c7453abef05a1b781e304c731cde0 100644
--- a/remoting/host/basic_desktop_environment.h
+++ b/remoting/host/basic_desktop_environment.h
@@ -12,6 +12,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "remoting/host/desktop_environment.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
namespace remoting {
@@ -26,6 +27,8 @@ class BasicDesktopEnvironment : public DesktopEnvironment {
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;
@@ -49,6 +52,10 @@ class BasicDesktopEnvironment : public DesktopEnvironment {
return ui_task_runner_;
}
+ webrtc::DesktopCaptureOptions* desktop_capture_options() {
+ return &desktop_capture_options_;
+ }
+
private:
// Task runner on which methods of DesktopEnvironment interface should be
// called.
@@ -60,6 +67,10 @@ class BasicDesktopEnvironment : public DesktopEnvironment {
// 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.
+ webrtc::DesktopCaptureOptions desktop_capture_options_;
+
DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironment);
};
« no previous file with comments | « no previous file | remoting/host/basic_desktop_environment.cc » ('j') | remoting/host/chromoting_param_traits.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698