mus ws: Consistently use mojom::Cursor instead of int32_t.

services/ui/ws/window_server.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/ws/window_server.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 402 matching lines @@
     pair.second->ProcessWindowReorder(window, relative_window, direction,
                                       IsOperationSource(pair.first));
   }
 }
 
 void WindowServer::ProcessWindowDeleted(ServerWindow* window) {
   for (auto& pair : tree_map_)
     pair.second->ProcessWindowDeleted(window, IsOperationSource(pair.first));
 }
 
-void WindowServer::ProcessWillChangeWindowPredefinedCursor(ServerWindow* window,
-                                                           int32_t cursor_id) {
+void WindowServer::ProcessWillChangeWindowPredefinedCursor(
+    ServerWindow* window, mojom::Cursor cursor_id) {
   for (auto& pair : tree_map_) {
     pair.second->ProcessCursorChanged(window, cursor_id,
                                       IsOperationSource(pair.first));
   }
 }
 
 void WindowServer::SendToPointerWatchers(const ui::Event& event,
                                          const UserId& user_id,
                                          ServerWindow* target_window,
                                          WindowTree* ignore_tree) {
@@ skipping 138 matching lines @@
   current_operation_ = nullptr;
 }
 
 void WindowServer::UpdateNativeCursorFromMouseLocation(ServerWindow* window) {
   WindowManagerDisplayRoot* display_root =
       display_manager_->GetWindowManagerDisplayRoot(window);
   if (display_root) {
     EventDispatcher* event_dispatcher =
         display_root->window_manager_state()->event_dispatcher();
     event_dispatcher->UpdateCursorProviderByLastKnownLocation();
-    int32_t cursor_id = 0;
+    mojom::Cursor cursor_id = mojom::Cursor::CURSOR_NULL;
     if (event_dispatcher->GetCurrentMouseCursor(&cursor_id))
       display_root->display()->UpdateNativeCursor(cursor_id);
   }
 }
 
 void WindowServer::UpdateNativeCursorIfOver(ServerWindow* window) {
   WindowManagerDisplayRoot* display_root =
       display_manager_->GetWindowManagerDisplayRoot(window);
   if (!display_root)
     return;
 
   EventDispatcher* event_dispatcher =
       display_root->window_manager_state()->event_dispatcher();
   if (window != event_dispatcher->mouse_cursor_source_window())
     return;
 
   event_dispatcher->UpdateNonClientAreaForCurrentWindow();
-  int32_t cursor_id = 0;
+  mojom::Cursor cursor_id = mojom::Cursor::CURSOR_NULL;
   if (event_dispatcher->GetCurrentMouseCursor(&cursor_id))
     display_root->display()->UpdateNativeCursor(cursor_id);
 }
 
 bool WindowServer::IsUserInHighContrastMode(const UserId& user) const {
   const auto iter = high_contrast_mode_.find(user);
   return (iter == high_contrast_mode_.end()) ? false : iter->second;
 }
 
 void WindowServer::OnScheduleWindowPaint(ServerWindow* window) {
@@ skipping 125 matching lines @@
     return;
 
   WindowManagerDisplayRoot* display_root =
       display_manager_->GetWindowManagerDisplayRoot(window);
   if (display_root)
     display_root->window_manager_state()->ReleaseCaptureBlockedByModalWindow(
         window);
 }
 
 void WindowServer::OnWindowPredefinedCursorChanged(ServerWindow* window,
-                                                   int32_t cursor_id) {
+                                                   mojom::Cursor cursor_id) {
   if (in_destructor_)
     return;
 
   ProcessWillChangeWindowPredefinedCursor(window, cursor_id);
 
   UpdateNativeCursorIfOver(window);
 }
 
 void WindowServer::OnWindowNonClientCursorChanged(ServerWindow* window,
-                                                  int32_t cursor_id) {
+                                                  mojom::Cursor cursor_id) {
   if (in_destructor_)
     return;
 
   UpdateNativeCursorIfOver(window);
 }
 
 void WindowServer::OnWindowSharedPropertyChanged(
     ServerWindow* window,
     const std::string& name,
     const std::vector<uint8_t>* new_data) {
@@ skipping 51 matching lines @@
 void WindowServer::OnUserIdAdded(const UserId& id) {
   activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr);
 }
 
 void WindowServer::OnUserIdRemoved(const UserId& id) {
   activity_monitor_map_.erase(id);
 }
 
 }  // namespace ws
 }  // namespace ui