Replaced CursorLoader in PlatformDisplay with a ImageCursor

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 <map>
@@ skipping 19 matching lines @@
 }  // namespace cc
 
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 class CursorLoader;
 class PlatformWindow;
 struct TextInputState;
 }  // namespace ui

[sadrul, 2016/08/22 15:18:14]

whoa. While you are here, mind merging this down to the block below?

Remove CursorLoader, since that's no longer used.

[Alex Z., 2016/08/22 15:26:02]

Done.

 
 namespace ui {
 
 class FrameGenerator;
+class ImageCursors;
 
 namespace ws {
 
 class EventDispatcher;
 class PlatformDisplayFactory;
 struct PlatformDisplayInitParams;
 class ServerWindow;
 
 // PlatformDisplay is used to connect the root ServerWindow to a display.
 class PlatformDisplay {
@@ skipping 102 matching lines @@
   // FrameGeneratorDelegate:
   ServerWindow* GetRootWindow() override;
   void OnCompositorFrameDrawn() override;
   bool IsInHighContrastMode() override;
   const ViewportMetrics& GetViewportMetrics() override;
 
   int64_t id_;
   display::PlatformScreen* platform_screen_;
 
 #if !defined(OS_ANDROID)
-  std::unique_ptr<ui::CursorLoader> cursor_loader_;
+  std::unique_ptr<ui::ImageCursors> image_cursors_;
 #endif
 
   PlatformDisplayDelegate* delegate_ = nullptr;
   std::unique_ptr<FrameGenerator> frame_generator_;
 
   ViewportMetrics metrics_;
   std::unique_ptr<ui::PlatformWindow> platform_window_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_PLATFORM_DISPLAY_H_