| Index: services/ui/ws/window_tree.h
|
| diff --git a/services/ui/ws/window_tree.h b/services/ui/ws/window_tree.h
|
| index 332f3504d5f6370912fc6d153c79ba931ffe5dc6..90300ec7806c503c1047649f32ed1abbe0c969dd 100644
|
| --- a/services/ui/ws/window_tree.h
|
| +++ b/services/ui/ws/window_tree.h
|
| @@ -247,7 +247,7 @@ class WindowTree : public mojom::WindowTree,
|
| float new_opacity,
|
| bool originated_change);
|
| void ProcessCursorChanged(const ServerWindow* window,
|
| - mojom::Cursor cursor_id,
|
| + mojom::CursorType cursor_id,
|
| bool originated_change);
|
| void ProcessFocusChanged(const ServerWindow* old_focused_window,
|
| const ServerWindow* new_focused_window);
|
| @@ -440,7 +440,7 @@ class WindowTree : public mojom::WindowTree,
|
| mojom::EventTargetingPolicy policy) override;
|
| void SetPredefinedCursor(uint32_t change_id,
|
| Id transport_window_id,
|
| - ui::mojom::Cursor cursor_id) override;
|
| + ui::mojom::CursorType cursor_id) override;
|
| void SetWindowTextInputState(Id transport_window_id,
|
| mojo::TextInputStatePtr state) override;
|
| void SetImeVisibility(Id transport_window_id,
|
| @@ -492,7 +492,7 @@ class WindowTree : public mojom::WindowTree,
|
| void WmSetFrameDecorationValues(
|
| mojom::FrameDecorationValuesPtr values) override;
|
| void WmSetNonClientCursor(uint32_t window_id,
|
| - mojom::Cursor cursor_id) override;
|
| + mojom::CursorType cursor_id) override;
|
| void OnWmCreatedTopLevelWindow(uint32_t change_id,
|
| Id transport_window_id) override;
|
| void OnAcceleratorAck(
|
|
|