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

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
« no previous file with comments | « remoting/host/video_scheduler.h ('k') | remoting/host/video_scheduler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/video_scheduler.cc
diff --git a/remoting/host/video_scheduler.cc b/remoting/host/video_scheduler.cc
index c2a797e111f80f0070d61d44e0a66419ced4f3ad..c2ca825fc9553690b4c842caade7c4561aa9976d 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"
@@ -77,12 +78,20 @@ void VideoScheduler::OnCaptureCompleted(
}
void VideoScheduler::OnCursorShapeChanged(
- scoped_ptr<protocol::CursorShapeInfo> cursor_shape) {
+ scoped_ptr<MouseCursorShape> cursor_shape) {
DCHECK(capture_task_runner_->BelongsToCurrentThread());
+ scoped_ptr<protocol::CursorShapeInfo> cursor_proto(
+ new protocol::CursorShapeInfo());
+ cursor_proto->set_width(cursor_shape->size.width());
+ cursor_proto->set_height(cursor_shape->size.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) {
« no previous file with comments | « remoting/host/video_scheduler.h ('k') | remoting/host/video_scheduler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698