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

Unified Diff: remoting/host/video_scheduler.cc

Issue 11470028: Move screen capturers to remoting/capturer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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/video_scheduler.cc
diff --git a/remoting/host/video_scheduler.cc b/remoting/host/video_scheduler.cc
index 305caba19d9d197bffa923c14ad729c01fd857db..5f926ae8a2004055a0d3aa84f980124fffcea8b4 100644
--- a/remoting/host/video_scheduler.cc
+++ b/remoting/host/video_scheduler.cc
@@ -14,8 +14,9 @@
#include "base/stl_util.h"
#include "base/sys_info.h"
#include "base/time.h"
-#include "remoting/base/capture_data.h"
-#include "remoting/host/video_frame_capturer.h"
+#include "remoting/capturer/capture_data.h"
+#include "remoting/capturer/mouse_cursor_shape.h"
+#include "remoting/capturer/video_frame_capturer.h"
#include "remoting/proto/control.pb.h"
#include "remoting/proto/internal.pb.h"
#include "remoting/proto/video.pb.h"
@@ -81,12 +82,20 @@ void VideoScheduler::OnCaptureCompleted(
}
void VideoScheduler::OnCursorShapeChanged(
- scoped_ptr<protocol::CursorShapeInfo> cursor_shape) {
+ const MouseCursorShape& cursor_shape) {
DCHECK(capture_task_runner_->BelongsToCurrentThread());
+ scoped_ptr<protocol::CursorShapeInfo> cursor_proto(
+ new protocol::CursorShapeInfo());
+ cursor_proto->set_width(cursor_shape.width);
+ cursor_proto->set_height(cursor_shape.height);
+ cursor_proto->set_hotspot_x(cursor_shape.hotspot_x);
+ cursor_proto->set_hotspot_y(cursor_shape.hotspot_y);
+ cursor_proto->set_data(cursor_shape.data);
+
network_task_runner_->PostTask(
FROM_HERE, base::Bind(&VideoScheduler::SendCursorShape, this,
- base::Passed(&cursor_shape)));
+ base::Passed(&cursor_proto)));
}
void VideoScheduler::Stop(const base::Closure& done_task) {

Powered by Google App Engine
This is Rietveld 408576698