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

services/ui/ws/window_manager_state.cc

 // 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.
 
 #include "services/ui/ws/window_manager_state.h"
 
 #include <utility>
 
 #include "base/memory/weak_ptr.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
@@ skipping 171 matching lines @@
       drag_source, window, source_connection, drag_pointer,
       std::move(drag_data), drag_operation);
 }
 
 void WindowManagerState::CancelDragDrop() {
   event_dispatcher_.CancelDragDrop();
 }
 
 void WindowManagerState::EndDragDrop() {
   event_dispatcher_.EndDragDrop();
+  UpdateNativeCursorFromDispatcher();
 }
 
 void WindowManagerState::AddSystemModalWindow(ServerWindow* window) {
   DCHECK(!window->transient_parent());
   event_dispatcher_.AddSystemModalWindow(window);
 }
 
 const UserId& WindowManagerState::user_id() const {
   return window_tree_->user_id();
 }
@@ skipping 204 matching lines @@
 void WindowManagerState::DispatchInputEventToWindowImpl(
     ServerWindow* target,
     ClientSpecificId client_id,
     const ui::Event& event,
     base::WeakPtr<Accelerator> accelerator) {
   if (target && target->parent() == nullptr)
     target = GetWindowManagerRoot(target);
 
   if (event.IsMousePointerEvent()) {
     DCHECK(event_dispatcher_.mouse_cursor_source_window());
-
-    int32_t cursor_id = 0;
-    if (event_dispatcher_.GetCurrentMouseCursor(&cursor_id)) {
-      WindowManagerDisplayRoot* display_root =
-          display_manager()->GetWindowManagerDisplayRoot(target);
-      display_root->display()->UpdateNativeCursor(cursor_id);
-    }
+    UpdateNativeCursorFromDispatcher();
   }
 
   event_dispatch_phase_ = EventDispatchPhase::TARGET;
 
   WindowTree* tree = window_server()->GetTreeWithId(client_id);
   DCHECK(tree);
   ScheduleInputEventTimeout(tree);
 
   event_awaiting_input_ack_ = ui::Event::Clone(event);
 
@@ skipping 91 matching lines @@
 void WindowManagerState::ReleaseNativeCapture() {
   // Tests trigger calling this without a corresponding SetNativeCapture().
   // TODO(sky): maybe abstract this away so that DCHECK can be added?
   if (!platform_display_with_capture_)
     return;
 
   platform_display_with_capture_->ReleaseCapture();
   platform_display_with_capture_ = nullptr;
 }
 
+void WindowManagerState::UpdateNativeCursorFromDispatcher() {
+  int32_t cursor_id = 0;
+  if (event_dispatcher_.GetCurrentMouseCursor(&cursor_id)) {
+    for (Display* display : display_manager()->displays())
+      display->UpdateNativeCursor(cursor_id);
+  }
+}
+
 void WindowManagerState::OnCaptureChanged(ServerWindow* new_capture,
                                           ServerWindow* old_capture) {
   window_server()->ProcessCaptureChanged(new_capture, old_capture);
 }
 
 void WindowManagerState::OnMouseCursorLocationChanged(const gfx::Point& point) {
   window_server()
       ->display_manager()
       ->GetUserDisplayManager(user_id())
       ->OnMouseCursorLocationChanged(point);
@@ skipping 88 matching lines @@
       window->RemoveObserver(this);
       orphaned_window_manager_display_roots_.erase(iter);
       return;
     }
   }
   NOTREACHED();
 }
 
 }  // namespace ws
 }  // namespace ui