WIP fix for Ozone cursor woes in Mushrome: Numéro deux

services/ui/ws/window_server.cc

 // Copyright 2014 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_server.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 97 matching lines @@
 }
 
 void WindowServer::SetGpuHost(std::unique_ptr<GpuHost> gpu_host) {
   gpu_host_ = std::move(gpu_host);
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>& WindowServer::GetResourceRunner() {
   return delegate()->GetResourceRunner();
 }
 
-base::WeakPtr<ui::ImageCursors> WindowServer::GetImageCursorsWeakPtr() {
-  return delegate()->GetImageCursorsWeakPtr();
+base::WeakPtr<ui::ImageCursorsHolder>
+WindowServer::GetImageCursorsHolderWeakPtr() {
+  return delegate()->GetImageCursorsHolderWeakPtr();
 }
 
 ServerWindow* WindowServer::CreateServerWindow(
     const WindowId& id,
     const std::map<std::string, std::vector<uint8_t>>& properties) {
   ServerWindow* window = new ServerWindow(this, id, properties);
   window->AddObserver(this);
   return window;
 }
 
@@ skipping 789 matching lines @@
 void WindowServer::OnUserIdAdded(const UserId& id) {
   activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr);
 }
 
 void WindowServer::OnUserIdRemoved(const UserId& id) {
   activity_monitor_map_.erase(id);
 }
 
 }  // namespace ws
 }  // namespace ui