[views-mus] Support custom cursors.

mash/simple_wm/move_event_handler.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 "mash/simple_wm/move_event_handler.h"
 
 #include "mash/simple_wm/move_loop.h"
 #include "services/ui/public/interfaces/cursor/cursor.mojom.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
+#include "ui/base/cursor/cursor.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event.h"
 
 namespace simple_wm {
 namespace {
 
-ui::mojom::CursorType CursorForWindowComponent(int window_component) {
+ui::CursorType CursorForWindowComponent(int window_component) {
   switch (window_component) {
     case HTBOTTOM:
-      return ui::mojom::CursorType::kSouthResize;
+      return ui::CursorType::kSouthResize;
     case HTBOTTOMLEFT:
-      return ui::mojom::CursorType::kSouthWestResize;
+      return ui::CursorType::kSouthWestResize;
     case HTBOTTOMRIGHT:
-      return ui::mojom::CursorType::kSouthEastResize;
+      return ui::CursorType::kSouthEastResize;
     case HTLEFT:
-      return ui::mojom::CursorType::kWestResize;
+      return ui::CursorType::kWestResize;
     case HTRIGHT:
-      return ui::mojom::CursorType::kEastResize;
+      return ui::CursorType::kEastResize;
     case HTTOP:
-      return ui::mojom::CursorType::kNorthResize;
+      return ui::CursorType::kNorthResize;
     case HTTOPLEFT:
-      return ui::mojom::CursorType::kNorthWestResize;
+      return ui::CursorType::kNorthWestResize;
     case HTTOPRIGHT:
-      return ui::mojom::CursorType::kNorthEastResize;
+      return ui::CursorType::kNorthEastResize;
     default:
-      return ui::mojom::CursorType::kNull;
+      return ui::CursorType::kNull;
   }
 }
 
 }  // namespace
 
 MoveEventHandler::MoveEventHandler(aura::Window* window)
     : window_(window) {
   window_->AddObserver(this);
   window_->AddPreTargetHandler(this);
 }
@@ skipping 23 matching lines @@
   if (move_loop_) {
     if (move_loop_->Move(*pointer_event.get()) == MoveLoop::DONE)
       move_loop_.reset();
   } else if (pointer_event->type() == ui::ET_POINTER_DOWN) {
     const int ht_location =
         GetNonClientComponentForEvent(pointer_event.get());
     if (ht_location != HTNOWHERE)
       move_loop_ = MoveLoop::Create(window_, ht_location, *pointer_event.get());
   } else if (pointer_event->type() == ui::ET_POINTER_MOVED) {
     const int ht_location = GetNonClientComponentForEvent(pointer_event.get());
-    aura::WindowPortMus::Get(window_)->SetPredefinedCursor(
-        CursorForWindowComponent(ht_location));
+    aura::WindowPortMus::Get(window_)->SetCursor(
+        ui::CursorData(CursorForWindowComponent(ht_location)));
   }
   if (had_move_loop || move_loop_)
     event->SetHandled();
 }
 
 int MoveEventHandler::GetNonClientComponentForEvent(
     const ui::LocatedEvent* event) {
   return window_->delegate()->GetNonClientComponent(event->location());
 }
 
@@ skipping 19 matching lines @@
   move_loop_.reset();
   event->SetHandled();
 }
 
 void MoveEventHandler::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(window_, window);
   Detach();
 }
 
 }  // namespace simple_wm