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

Unified Diff: remoting/host/basic_desktop_environment.cc

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
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..64a94c99fced9762f68cb73ee7faf1b64015d7c7 100644
--- a/remoting/host/basic_desktop_environment.cc
+++ b/remoting/host/basic_desktop_environment.cc
@@ -11,6 +11,7 @@
#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/mouse_cursor_monitor.h"
#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
namespace remoting {
@@ -37,6 +38,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 +59,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 +69,8 @@ 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_(webrtc::DesktopCaptureOptions::CreateDefault()) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
}

Powered by Google App Engine
This is Rietveld 408576698