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

services/ui/ws/drag_controller.h

 // Copyright 2016 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.
 
 #ifndef SERVICES_UI_WS_DRAG_CONTROLLER_H_
 #define SERVICES_UI_WS_DRAG_CONTROLLER_H_
 
 #include <map>
 #include <set>
 
 #include "base/memory/weak_ptr.h"
 #include "services/ui/common/types.h"
+#include "services/ui/public/interfaces/cursor.mojom.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/server_window_observer.h"
 
 namespace ui {
 namespace ws {
 
 namespace test {
 class DragControllerTestApi;
 }
 
@@ skipping 15 matching lines @@
  public:
   DragController(DragCursorUpdater* cursor_updater,
                  DragSource* source,
                  ServerWindow* source_window,
                  DragTargetConnection* source_connection,
                  int32_t drag_pointer,
                  mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data,
                  DropEffectBitmask drag_operations);
   ~DragController() override;
 
-  int32_t current_cursor() const { return current_cursor_; }
+  ui::mojom::Cursor current_cursor() const { return current_cursor_; }
 
   // Cancels the current drag, ie, due to the user pressing Escape.
   void Cancel();
 
   // Responds to a pointer move/release event. Returns true if the event was
   // handled by the drag.
   bool DispatchPointerEvent(const ui::PointerEvent& event,
                             ServerWindow* current_target);
 
   void OnWillDestroyDragTargetConnection(DragTargetConnection* connection);
@@ skipping 17 matching lines @@
   // Sets |current_target_window_| to |current_target|, making sure that we add
   // and release ServerWindow observers correctly.
   void SetCurrentTargetWindow(ServerWindow* current_target);
 
   // Updates the possible cursor effects for |window|. |bitmask| is a
   // bitmask of the current valid drag operations.
   void SetWindowDropOperations(ServerWindow* window, DropEffectBitmask bitmask);
 
   // Returns the ui::mojom::Cursor for the window |bitmask|, adjusted for types
   // that the drag source allows.
-  int32_t CursorForEffectBitmask(DropEffectBitmask bitmask);
+  ui::mojom::Cursor CursorForEffectBitmask(DropEffectBitmask bitmask);
 
   // Ensure that |window| has an entry in |window_state_| and that we're an
   // observer.
   void EnsureWindowObserved(ServerWindow* window);
 
   void QueueOperation(ServerWindow* window,
                       OperationType type,
                       uint32_t event_flags,
                       gfx::Point screen_position);
   void DispatchOperation(ServerWindow* window, WindowState* state);
@@ skipping 12 matching lines @@
   // Object to notify about all cursor changes.
   DragCursorUpdater* cursor_updater_;
 
   // A bit-field of acceptable drag operations offered by the source.
   const DropEffectBitmask drag_operations_;
 
   // Only act on pointer events that meet this id.
   const int32_t drag_pointer_id_;
 
   // The current mouse cursor during the drag.
-  int32_t current_cursor_;
+  ui::mojom::Cursor current_cursor_;
 
   // Sending OnDragOver() to our |source_| destroys us; there is a period where
   // we have to continue to exist, but not process any more pointer events.
   bool waiting_for_final_drop_response_ = false;
 
   ServerWindow* source_window_;
   ServerWindow* current_target_window_ = nullptr;
 
   // The target connection that |source_window_| is part of.
   DragTargetConnection* source_connection_;
@@ skipping 13 matching lines @@
 
   base::WeakPtrFactory<DragController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DragController);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DRAG_CONTROLLER_H_