| Index: remoting/host/chromoting_messages.h
|
| diff --git a/remoting/host/chromoting_messages.h b/remoting/host/chromoting_messages.h
|
| index 4407f4905d7d35691f501e62af0fc8e102d5c410..f62bfbb588606a7d79f125a9c9993dfe255f6ac7 100644
|
| --- a/remoting/host/chromoting_messages.h
|
| +++ b/remoting/host/chromoting_messages.h
|
| @@ -6,7 +6,7 @@
|
| #define REMOTING_HOST_CHROMOTING_MESSAGES_H_
|
|
|
| #include "ipc/ipc_platform_file.h"
|
| -#include "remoting/capturer/mouse_cursor_shape.h"
|
| +#include "media/video/capture/screen/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"
|
| @@ -128,13 +128,13 @@ IPC_STRUCT_TRAITS_BEGIN(SkISize)
|
| IPC_STRUCT_TRAITS_MEMBER(fHeight)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(remoting::MouseCursorShape)
|
| +IPC_STRUCT_TRAITS_BEGIN(media::MouseCursorShape)
|
| IPC_STRUCT_TRAITS_MEMBER(size)
|
| IPC_STRUCT_TRAITS_MEMBER(hotspot)
|
| IPC_STRUCT_TRAITS_MEMBER(data)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -// Serialized CaptureData structure.
|
| +// Serialized media::ScreenCaptureData structure.
|
| IPC_STRUCT_BEGIN(SerializedCapturedData)
|
| // ID of the shared memory buffer containing the pixels.
|
| IPC_STRUCT_MEMBER(int, shared_buffer_id)
|
| @@ -164,7 +164,7 @@ IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted,
|
|
|
| // Carries a cursor share update from the desktop session agent to the client.
|
| IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CursorShapeChanged,
|
| - remoting::MouseCursorShape /* cursor_shape */ )
|
| + media::MouseCursorShape /* cursor_shape */ )
|
|
|
| // Carries a clipboard event from the desktop session agent to the client.
|
| // |serialized_event| is a serialized protocol::ClipboardEvent.
|
|
|