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

services/ui/service.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_SERVICE_H_
 #define SERVICES_UI_SERVICE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 35 matching lines @@
 class ScreenManager;
 }
 
 namespace service_manager {
 class Connector;
 class Identity;
 }
 
 namespace ui {
 
-class ImageCursors;
+class ImageCursorsHolder;
 class InputDeviceController;
 class PlatformEventSource;
 
 namespace ws {
 class WindowServer;
 }
 
 class Service : public service_manager::Service,
                 public ws::WindowServerDelegate {
  public:
   // |resource_runner| is the task runner for the thread which can be used to
   // load resources. Used when UI Service run inside a Window Manager's
   // process (and so the resources need to be loaded on the WM's thread).
   // When UI Service is run in a separate process, |resource_runner|
   // should be null, and resources are loaded on the UI Service's thread.
   // |image_cursors_weak_ptr| is also only used when the UI service runs
   // in-process. It can only be dereferenced on |resource_runner|.
   Service(scoped_refptr<base::SingleThreadTaskRunner> resource_runner,
-          base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr);
+          base::WeakPtr<ui::ImageCursorsHolder> image_cursors_holder_weak_ptr);
   ~Service() override;
 
  private:
   // Holds InterfaceRequests received before the first WindowTreeHost Display
   // has been established.
   struct PendingRequest;
   struct UserState;
 
   using UserIdToUserState = std::map<ws::UserId, std::unique_ptr<UserState>>;
 
@@ skipping 18 matching lines @@
                        mojo::ScopedMessagePipeHandle interface_pipe) override;
 
   // WindowServerDelegate:
   void StartDisplayInit() override;
   void OnFirstDisplayReady() override;
   void OnNoMoreDisplays() override;
   bool IsTestConfig() const override;
   void OnWillCreateTreeForWindowManager(
       bool automatically_create_display_roots) override;
   scoped_refptr<base::SingleThreadTaskRunner>& GetResourceRunner() override;
-  base::WeakPtr<ui::ImageCursors> GetImageCursorsWeakPtr() override;
+  base::WeakPtr<ui::ImageCursorsHolder> GetImageCursorsHolderWeakPtr() override;
 
   void BindAccessibilityManagerRequest(
       const service_manager::BindSourceInfo& source_info,
       mojom::AccessibilityManagerRequest request);
 
   void BindClipboardRequest(const service_manager::BindSourceInfo& source_info,
                             mojom::ClipboardRequest request);
 
   void BindDisplayManagerRequest(
       const service_manager::BindSourceInfo& source_info,
@@ skipping 52 matching lines @@
   // its own process.
   bool in_process_;
 
   // Can be used to access resources. Will be null until the service is started
   // if the UI Service doesn't run in WM's process.
   scoped_refptr<base::SingleThreadTaskRunner> resource_runner_;
 
   // Used when UI Service runs in-process, and can only be de-referenced on
   // |resource_runner_|. When UI Service doesn't run in-process, this points to
   // |image_cursors_| (and should be de-referenced on UI Serivice's thread).
-  base::WeakPtr<ui::ImageCursors> image_cursors_weak_ptr_;
+  base::WeakPtr<ui::ImageCursorsHolder> image_cursors_holder_weak_ptr_;
 
   // Used when UI Service doesn't run in-process.
-  std::unique_ptr<ui::ImageCursors> image_cursors_;
+  std::unique_ptr<ui::ImageCursorsHolder> image_cursors_holder_;
 
   bool test_config_;
 #if defined(USE_OZONE)
   std::unique_ptr<gfx::ClientNativePixmapFactory> client_native_pixmap_factory_;
 #if defined(OS_CHROMEOS)
   std::unique_ptr<InputDeviceController> input_device_controller_;
 #endif
 #endif
 
   // Manages display hardware and handles display management. May register Mojo
@@ skipping 10 matching lines @@
 
   // Set to true in StartDisplayInit().
   bool is_gpu_ready_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SERVICE_H_