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

services/ui/ws/window_server.h

 // 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.
 
 #ifndef SERVICES_UI_WS_WINDOW_SERVER_H_
 #define SERVICES_UI_WS_WINDOW_SERVER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 12 matching lines @@
 #include "services/ui/ws/operation.h"
 #include "services/ui/ws/server_window_delegate.h"
 #include "services/ui/ws/server_window_observer.h"
 #include "services/ui/ws/user_display_manager_delegate.h"
 #include "services/ui/ws/user_id_tracker.h"
 #include "services/ui/ws/user_id_tracker_observer.h"
 #include "services/ui/ws/window_manager_window_tree_factory_set.h"
 
 namespace ui {
 
-class ImageCursors;
+class ImageCursorsHolder;
 
 namespace ws {
 
 class AccessPolicy;
 class Display;
 class DisplayManager;
 class GpuHost;
 class ServerWindow;
 class UserActivityMonitor;
 class WindowManagerState;
@@ skipping 38 matching lines @@
   void SetFrameSinkManager(
       std::unique_ptr<cc::mojom::FrameSinkManager> frame_sink_manager);
 
   void SetGpuHost(std::unique_ptr<GpuHost> gpu_host);
 
   // Returns a valid task runner which can be used to load resources.
   scoped_refptr<base::SingleThreadTaskRunner>& GetResourceRunner();
 
   // The returned weak pointer can be used to manipulate the cursor, and should
   // only be dereferenced on the task runner returned by GetResourceRunner().
-  base::WeakPtr<ui::ImageCursors> GetImageCursorsWeakPtr();
+  base::WeakPtr<ui::ImageCursorsHolder> GetImageCursorsHolderWeakPtr();
 
   // Creates a new ServerWindow. The return value is owned by the caller, but
   // must be destroyed before WindowServer.
   ServerWindow* CreateServerWindow(
       const WindowId& id,
       const std::map<std::string, std::vector<uint8_t>>& properties);
 
   // Returns the id for the next WindowTree.
   ClientSpecificId GetAndAdvanceNextClientId();
 
@@ skipping 317 matching lines @@
 
   DisplayCreationConfig display_creation_config_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowServer);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_SERVER_H_