summaryrefslogtreecommitdiffstats
path: root/remoting/host/chromoting_messages.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 21:42:12 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-18 21:42:12 +0000
commit420a5e4ab23188ab8458c659b331da1d580f6dd7 (patch)
treeccdd9a8f74998b335ea8a96da6e26a633633e9c6 /remoting/host/chromoting_messages.h
parent4051754026b9163d6fbbfb329bba3a03a333617c (diff)
downloadchromium_src-420a5e4ab23188ab8458c659b331da1d580f6dd7.zip
chromium_src-420a5e4ab23188ab8458c659b331da1d580f6dd7.tar.gz
chromium_src-420a5e4ab23188ab8458c659b331da1d580f6dd7.tar.bz2
Move screen capturers to remoting/capturer.
Separating screen capturer code from the rest of remoting code so that it can be reused for screen capturing in WebRTC. Also added struct MouseCursorShape to avoid protobuf dependency. BUG=134249 Review URL: https://codereview.chromium.org/11470028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/chromoting_messages.h')
-rw-r--r--remoting/host/chromoting_messages.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/remoting/host/chromoting_messages.h b/remoting/host/chromoting_messages.h
index be100a6..f389467 100644
--- a/remoting/host/chromoting_messages.h
+++ b/remoting/host/chromoting_messages.h
@@ -6,6 +6,7 @@
#define REMOTING_HOST_CHROMOTING_MESSAGES_H_
#include "ipc/ipc_platform_file.h"
+#include "remoting/capturer/mouse_cursor_shape.h"
#include "third_party/skia/include/core/SkPoint.h"
#include "third_party/skia/include/core/SkRect.h"
#include "third_party/skia/include/core/SkSize.h"
@@ -127,6 +128,12 @@ IPC_STRUCT_TRAITS_BEGIN(SkISize)
IPC_STRUCT_TRAITS_MEMBER(fHeight)
IPC_STRUCT_TRAITS_END()
+IPC_STRUCT_TRAITS_BEGIN(remoting::MouseCursorShape)
+ IPC_STRUCT_TRAITS_MEMBER(size)
+ IPC_STRUCT_TRAITS_MEMBER(hotspot)
+ IPC_STRUCT_TRAITS_MEMBER(data)
+IPC_STRUCT_TRAITS_END()
+
// Serialized CaptureData structure.
IPC_STRUCT_BEGIN(SerializedCapturedData)
// ID of the shared memory buffer containing the pixels.
@@ -159,9 +166,8 @@ IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted,
SerializedCapturedData /* capture_data */ )
// Carries a cursor share update from the desktop session agent to the client.
-// |serialized_cursor_shape| is a serialized protocol::CursorShapeInfo.
IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CursorShapeChanged,
- std::string /* serialized_cursor_shape */ )
+ remoting::MouseCursorShape /* cursor_shape */ )
// Carries a clipboard event from the desktop session agent to the client.
// |serialized_event| is a serialized protocol::ClipboardEvent.