| Index: services/ui/ws/drag_controller.h
|
| diff --git a/services/ui/ws/drag_controller.h b/services/ui/ws/drag_controller.h
|
| index 3862051d709903b368878a25628188d0df8a8ebb..1517a510b5f20dcdb87d49fed04d6587c50ea7ae 100644
|
| --- a/services/ui/ws/drag_controller.h
|
| +++ b/services/ui/ws/drag_controller.h
|
| @@ -10,6 +10,7 @@
|
|
|
| #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"
|
|
|
| @@ -45,7 +46,7 @@ class DragController : public ServerWindowObserver {
|
| 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();
|
| @@ -83,7 +84,7 @@ class DragController : public ServerWindowObserver {
|
|
|
| // 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.
|
| @@ -116,7 +117,7 @@ class DragController : public ServerWindowObserver {
|
| 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.
|
|
|