[views-mus] Support custom cursors.

ui/views/mus/desktop_window_tree_host_mus.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 "ui/views/mus/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 17 matching lines @@
 #include "ui/views/mus/mus_property_mirror.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/cursor_manager.h"
 #include "ui/wm/core/native_cursor_manager.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
+#if defined(USE_OZONE)
+#include "ui/base/cursor/ozone/cursor_data_factory_ozone.h"
+#endif
+
 namespace views {
 
 namespace {
 
 // As the window manager renderers the non-client decorations this class does
 // very little but honor the client area insets from the window manager.
 class ClientSideNonClientFrameView : public NonClientFrameView {
  public:
   explicit ClientSideNonClientFrameView(views::Widget* widget)
       : widget_(widget) {}
@@ skipping 76 matching lines @@
   ~NativeCursorManagerMus() override {}
 
   // wm::NativeCursorManager:
   void SetDisplay(const display::Display& display,
                   wm::NativeCursorManagerDelegate* delegate) override {
     // We ignore this entirely, as cursor are set on the client.
   }
 
   void SetCursor(gfx::NativeCursor cursor,
                  wm::NativeCursorManagerDelegate* delegate) override {
-    aura::WindowPortMus::Get(window_)->SetPredefinedCursor(
-        ui::mojom::CursorType(cursor.native_type()));
+    ui::CursorData mojo_cursor;
+    if (cursor.platform()) {
+#if defined(USE_OZONE)
+      mojo_cursor =
+          ui::CursorDataFactoryOzone::GetCursorData(cursor.platform());
+#else
+      NOTIMPLEMENTED()
+          << "Can't pass native platform cursors on non-ozone platforms";
+      mojo_cursor = ui::CursorData(ui::CursorType::kPointer);
+#endif
+    } else {
+      mojo_cursor = ui::CursorData(cursor.native_type());
+    }
+
+    aura::WindowPortMus::Get(window_)->SetCursor(mojo_cursor);
     delegate->CommitCursor(cursor);
   }
 
   void SetVisibility(bool visible,
                      wm::NativeCursorManagerDelegate* delegate) override {
     delegate->CommitVisibility(visible);
 
     if (visible) {
       SetCursor(delegate->GetCursor(), delegate);
     } else {
-      aura::WindowPortMus::Get(window_)->SetPredefinedCursor(
-          ui::mojom::CursorType::kNone);
+      aura::WindowPortMus::Get(window_)->SetCursor(
+          ui::CursorData(ui::CursorType::kNone));
     }
   }
 
   void SetCursorSet(ui::CursorSetType cursor_set,
                     wm::NativeCursorManagerDelegate* delegate) override {
     // TODO(erg): For now, ignore the difference between SET_NORMAL and
     // SET_LARGE here. This feels like a thing that mus should decide instead.
     //
     // Also, it's NOTIMPLEMENTED() in the desktop version!? Including not
     // acknowledging the call in the delegate.
@@ skipping 640 matching lines @@
   }
   const gfx::Rect old_bounds_in_pixels = GetBoundsInPixels();
   WindowTreeHostMus::SetBoundsInPixels(final_bounds_in_pixels);
   if (old_bounds_in_pixels.size() != final_bounds_in_pixels.size()) {
     SendClientAreaToServer();
     SendHitTestMaskToServer();
   }
 }
 
 }  // namespace views