mus: Keep track of the drag cursor during DnD operations.

services/ui/ws/event_dispatcher.cc

 // Copyright 2015 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/event_dispatcher.h"
 
 #include <algorithm>
 
 #include "base/time/time.h"
 #include "services/ui/ws/accelerator.h"
@@ skipping 86 matching lines @@
   DCHECK(pointer_targets_.empty());
   mouse_pointer_last_location_ = screen_location;
   UpdateCursorProviderByLastKnownLocation();
   // Write our initial location back to our shared screen coordinate. This
   // shouldn't cause problems because we already read the cursor before we
   // process any events in views during window construction.
   delegate_->OnMouseCursorLocationChanged(screen_location);
 }
 
 bool EventDispatcher::GetCurrentMouseCursor(int32_t* cursor_out) {
+  if (drag_controller_) {
+    *cursor_out = drag_controller_->current_cursor();
+    return true;
+  }
+
   if (!mouse_cursor_source_window_)
     return false;
 
   *cursor_out = mouse_cursor_in_non_client_area_
                     ? mouse_cursor_source_window_->non_client_cursor()
                     : mouse_cursor_source_window_->cursor();
   return true;
 }
 
 bool EventDispatcher::SetCaptureWindow(ServerWindow* window,
@@ skipping 48 matching lines @@
 
 void EventDispatcher::SetDragDropSourceWindow(
     DragSource* drag_source,
     ServerWindow* window,
     DragTargetConnection* source_connection,
     int32_t drag_pointer,
     mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data,
     uint32_t drag_operations) {
   CancelImplicitCaptureExcept(nullptr);
   drag_controller_ = base::MakeUnique<DragController>(
-      drag_source, window, source_connection, drag_pointer,
+      this, drag_source, window, source_connection, drag_pointer,
       std::move(mime_data), drag_operations);
 }
 
 void EventDispatcher::CancelDragDrop() {
   if (drag_controller_)
     drag_controller_->Cancel();
 }
 
 void EventDispatcher::EndDragDrop() {
   drag_controller_.reset();
@@ skipping 419 matching lines @@
   CancelPointerEventsToTarget(window);
 }
 
 void EventDispatcher::OnWindowDestroyed(ServerWindow* window) {
   CancelPointerEventsToTarget(window);
 
   if (mouse_cursor_source_window_ == window)
     mouse_cursor_source_window_ = nullptr;
 }
 
+void EventDispatcher::OnDragCursorUpdated() {
+  delegate_->UpdateNativeCursorFromDispatcher();
+}
+
 }  // namespace ws
 }  // namespace ui