| Index: services/ui/ws/window_server.h
|
| diff --git a/services/ui/ws/window_server.h b/services/ui/ws/window_server.h
|
| index 466c0169559945e6c6e23d88c88b11511f4fc5f4..d76131cce10edb6d550462bfe4b6584072cae159 100644
|
| --- a/services/ui/ws/window_server.h
|
| +++ b/services/ui/ws/window_server.h
|
| @@ -188,7 +188,7 @@ class WindowServer : public ServerWindowDelegate,
|
| const mojom::OrderDirection direction);
|
| void ProcessWindowDeleted(ServerWindow* window);
|
| void ProcessWillChangeWindowPredefinedCursor(ServerWindow* window,
|
| - mojom::Cursor cursor_id);
|
| + mojom::CursorType cursor_id);
|
|
|
| // Sends an |event| to all WindowTrees belonging to |user_id| that might be
|
| // observing events. Skips |ignore_tree| if it is non-null. |target_window| is
|
| @@ -322,9 +322,9 @@ class WindowServer : public ServerWindowDelegate,
|
| const std::string& name,
|
| const std::vector<uint8_t>* new_data) override;
|
| void OnWindowPredefinedCursorChanged(ServerWindow* window,
|
| - mojom::Cursor cursor_id) override;
|
| + mojom::CursorType cursor_id) override;
|
| void OnWindowNonClientCursorChanged(ServerWindow* window,
|
| - mojom::Cursor cursor_id) override;
|
| + mojom::CursorType cursor_id) override;
|
| void OnWindowTextInputStateChanged(ServerWindow* window,
|
| const ui::TextInputState& state) override;
|
| void OnTransientWindowAdded(ServerWindow* window,
|
|
|