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

Unified Diff: remoting/host/desktop_session_agent.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/desktop_session_agent.cc
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index 53dacedbeb4ec7c06d594c11b1dfe5c1a1592004..e918850df4edc05061e82f3c1c06b1a514aacc6f 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -9,9 +9,9 @@
#include "ipc/ipc_message.h"
#include "ipc/ipc_message_macros.h"
#include "remoting/base/auto_thread_task_runner.h"
-#include "remoting/base/capture_data.h"
#include "remoting/base/constants.h"
#include "remoting/base/util.h"
+#include "remoting/capturer/capture_data.h"
#include "remoting/host/chromoting_messages.h"
#include "remoting/host/event_executor.h"
#include "remoting/proto/control.pb.h"
@@ -164,18 +164,11 @@ void DesktopSessionAgent::OnCaptureCompleted(
}
void DesktopSessionAgent::OnCursorShapeChanged(
- scoped_ptr<protocol::CursorShapeInfo> cursor_shape) {
+ scoped_ptr<MouseCursorShape> cursor_shape) {
DCHECK(video_capture_task_runner()->BelongsToCurrentThread());
- // Serialize |cursor_shape| to a string.
- std::string serialized_cursor_shape;
- if (!cursor_shape->SerializeToString(&serialized_cursor_shape)) {
- LOG(ERROR) << "Failed to serialize protocol::CursorShapeInfo.";
- return;
- }
-
SendToNetwork(new ChromotingDesktopNetworkMsg_CursorShapeChanged(
- serialized_cursor_shape));
+ *cursor_shape));
}
void DesktopSessionAgent::InjectClipboardEvent(

Powered by Google App Engine
This is Rietveld 408576698