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

services/ui/ws/window_server_delegate.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_DELEGATE_H_
 #define SERVICES_UI_WS_WINDOW_SERVER_DELEGATE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/ui/common/types.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace ui {
 
-class ImageCursors;
+class ImageCursorsHolder;
 
 namespace mojom {
 class WindowTree;
 }
 
 namespace ws {
 
 class Display;
 class WindowServer;
 class WindowTree;
@@ skipping 29 matching lines @@
   // WindowManagerWindowTreeFactory. |automatically_create_display_roots|
   // mirrors that of CreateWindowTree(). See it for details.
   virtual void OnWillCreateTreeForWindowManager(
       bool automatically_create_display_roots) = 0;
 
   // Returns a valid task runner which can be used to load resources.
   virtual scoped_refptr<base::SingleThreadTaskRunner>& GetResourceRunner() = 0;
 
   // The returned weak pointer can be used to manipulate the cursor, and should
   // only be dereferenced on the task runner returned by GetResourceRunner().
-  virtual base::WeakPtr<ui::ImageCursors> GetImageCursorsWeakPtr() = 0;
+  virtual base::WeakPtr<ui::ImageCursorsHolder>
+  GetImageCursorsHolderWeakPtr() = 0;
 
  protected:
   virtual ~WindowServerDelegate() {}
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_SERVER_DELEGATE_H_