mash: Fix non client cursor display.

mash/wm/frame/move_event_handler.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 "mash/wm/frame/move_event_handler.h"
 
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_manager_delegate.h"
 #include "components/mus/public/interfaces/cursor.mojom.h"
 #include "mash/wm/bridge/wm_window_mus.h"
@@ skipping 52 matching lines @@
     return;
 
   root_window_->RemoveObserver(this);
   root_window_->RemovePreTargetHandler(this);
   root_window_ = nullptr;
 }
 
 void MoveEventHandler::OnMouseEvent(ui::MouseEvent* event) {
   toplevel_window_event_handler_.OnMouseEvent(event, wm_window_);
   if (!toplevel_window_event_handler_.is_drag_in_progress() &&
-      event->type() == ui::ET_POINTER_MOVED) {
+      (event->type() == ui::ET_POINTER_MOVED ||
+       event->type() == ui::ET_MOUSE_MOVED)) {
     const int hit_test_location =
         wm_window_->GetNonClientComponent(event->location());
     window_manager_client_->SetNonClientCursor(
         wm_window_->mus_window(), CursorForWindowComponent(hit_test_location));
   }
 }
 
 void MoveEventHandler::OnGestureEvent(ui::GestureEvent* event) {
   toplevel_window_event_handler_.OnGestureEvent(event, wm_window_);
 }
 
 void MoveEventHandler::OnCancelMode(ui::CancelModeEvent* event) {
   toplevel_window_event_handler_.RevertDrag();
 }
 
 void MoveEventHandler::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(root_window_, window);
   Detach();
 }
 
 }  // namespace wm
 }  // namespace mash