| Index: services/ui/ws/window_server.cc
|
| diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
|
| index c893898437022868b74c20521f7dbce6ddb9775f..364c06b29a6ef2c01c673fb5b5e7d627a16e9083 100644
|
| --- a/services/ui/ws/window_server.cc
|
| +++ b/services/ui/ws/window_server.cc
|
| @@ -420,7 +420,8 @@ void WindowServer::ProcessWindowDeleted(ServerWindow* window) {
|
| }
|
|
|
| void WindowServer::ProcessWillChangeWindowPredefinedCursor(
|
| - ServerWindow* window, mojom::Cursor cursor_id) {
|
| + ServerWindow* window,
|
| + mojom::CursorType cursor_id) {
|
| for (auto& pair : tree_map_) {
|
| pair.second->ProcessCursorChanged(window, cursor_id,
|
| IsOperationSource(pair.first));
|
| @@ -751,8 +752,9 @@ void WindowServer::OnWindowVisibilityChanged(ServerWindow* window) {
|
| window);
|
| }
|
|
|
| -void WindowServer::OnWindowPredefinedCursorChanged(ServerWindow* window,
|
| - mojom::Cursor cursor_id) {
|
| +void WindowServer::OnWindowPredefinedCursorChanged(
|
| + ServerWindow* window,
|
| + mojom::CursorType cursor_id) {
|
| if (in_destructor_)
|
| return;
|
|
|
| @@ -762,7 +764,7 @@ void WindowServer::OnWindowPredefinedCursorChanged(ServerWindow* window,
|
| }
|
|
|
| void WindowServer::OnWindowNonClientCursorChanged(ServerWindow* window,
|
| - mojom::Cursor cursor_id) {
|
| + mojom::CursorType cursor_id) {
|
| if (in_destructor_)
|
| return;
|
|
|
|
|