[views-mus] Support custom cursors.

services/ui/ws/display.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/display.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 19 matching lines @@
 #include "ui/display/screen.h"
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace ui {
 namespace ws {
 
 Display::Display(WindowServer* window_server)
-    : window_server_(window_server), last_cursor_(mojom::CursorType::kNull) {
+    : window_server_(window_server),
+      last_cursor_(ui::CursorData(ui::CursorType::kNull)) {
   window_server_->window_manager_window_tree_factory_set()->AddObserver(this);
   window_server_->user_id_tracker()->AddObserver(this);
 }
 
 Display::~Display() {
   window_server_->user_id_tracker()->RemoveObserver(this);
 
   window_server_->window_manager_window_tree_factory_set()->RemoveObserver(
       this);
 
@@ skipping 139 matching lines @@
   for (auto it = window_manager_display_root_map_.begin();
        it != window_manager_display_root_map_.end(); ++it) {
     if (it->second == display_root) {
       window_manager_display_root_map_.erase(it);
       return;
     }
   }
   NOTREACHED();
 }
 
-void Display::UpdateNativeCursor(mojom::CursorType cursor_id) {
-  if (cursor_id != last_cursor_) {
-    platform_display_->SetCursorById(cursor_id);
-    last_cursor_ = cursor_id;
+void Display::UpdateNativeCursor(const ui::CursorData& cursor) {
+  if (!last_cursor_.IsSameAs(cursor)) {
+    platform_display_->SetCursor(cursor);
+    last_cursor_ = cursor;
   }
 }
 
 void Display::SetSize(const gfx::Size& size) {
   platform_display_->SetViewportSize(size);
 }
 
 void Display::SetTitle(const std::string& title) {
   platform_display_->SetTitle(base::UTF8ToUTF16(title));
 }
@@ skipping 197 matching lines @@
 
   UserActivityMonitor* activity_monitor =
       window_server_->GetUserActivityMonitorForUser(
           window_server_->user_id_tracker()->active_id());
   activity_monitor->OnUserActivity();
   return EventDispatchDetails();
 }
 
 }  // namespace ws
 }  // namespace ui