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

services/ui/ws/platform_display.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_PLATFORM_DISPLAY_H_
 #define SERVICES_UI_WS_PLATFORM_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "services/ui/display/viewport_metrics.h"
 #include "services/ui/public/interfaces/cursor/cursor.mojom.h"
 #include "ui/events/event_source.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace ui {
 
 enum class CursorSize;
-class ImageCursors;
+class ImageCursorsHolder;
 struct TextInputState;
 
 namespace ws {
 
 class FrameGenerator;
 class PlatformDisplayDelegate;
 class PlatformDisplayFactory;
 class ServerWindow;
 
 // PlatformDisplay is used to connect the root ServerWindow to a display.
 class PlatformDisplay : public ui::EventSource {
  public:
   ~PlatformDisplay() override {}
 
   static std::unique_ptr<PlatformDisplay> Create(
       ServerWindow* root_window,
       const display::ViewportMetrics& metrics,
       scoped_refptr<base::SingleThreadTaskRunner>& resource_runner,
-      base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr);
+      base::WeakPtr<ui::ImageCursorsHolder> image_cursors_holder_weak_ptr);
 
   virtual void Init(PlatformDisplayDelegate* delegate) = 0;
 
   virtual void SetViewportSize(const gfx::Size& size) = 0;
 
   virtual void SetTitle(const base::string16& title) = 0;
 
   virtual void SetCapture() = 0;
 
   virtual void ReleaseCapture() = 0;
@@ skipping 26 matching lines @@
  private:
   // Static factory instance (always NULL for non-test).
   static PlatformDisplayFactory* factory_;
 };
 
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_PLATFORM_DISPLAY_H_