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..142482d4da4d03ec9daf83d74ab218586fce9591 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,14 @@ scoped_ptr<ScreenControls> BasicDesktopEnvironment::CreateScreenControls() { |
return scoped_ptr<ScreenControls>(); |
} |
+scoped_ptr<webrtc::MouseCursorMonitor> |
+BasicDesktopEnvironment::CreateMouseCursorMonitor() { |
+ return scoped_ptr<webrtc::MouseCursorMonitor>( |
+ webrtc::MouseCursorMonitor::CreateForScreen( |
+ *desktop_capture_options_, |
+ webrtc::kFullDesktopScreenId)); |
+} |
+ |
std::string BasicDesktopEnvironment::GetCapabilities() const { |
return std::string(); |
} |
@@ -50,7 +60,8 @@ BasicDesktopEnvironment::CreateVideoCapturer() { |
// The basic desktop environment does not use X DAMAGE, since it is |
// broken on many systems - see http://crbug.com/73423. |
- return scoped_ptr<webrtc::ScreenCapturer>(webrtc::ScreenCapturer::Create()); |
+ return scoped_ptr<webrtc::ScreenCapturer>( |
+ webrtc::ScreenCapturer::Create(*desktop_capture_options_)); |
} |
BasicDesktopEnvironment::BasicDesktopEnvironment( |
@@ -59,7 +70,10 @@ BasicDesktopEnvironment::BasicDesktopEnvironment( |
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
: caller_task_runner_(caller_task_runner), |
input_task_runner_(input_task_runner), |
- ui_task_runner_(ui_task_runner) { |
+ ui_task_runner_(ui_task_runner), |
+ desktop_capture_options_( |
+ new webrtc::DesktopCaptureOptions( |
+ webrtc::DesktopCaptureOptions::CreateDefault())) { |
DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
} |