Replaced CursorLoader in PlatformDisplay with a ImageCursor

services/ui/ws/platform_display.h

Index: services/ui/ws/platform_display.h
diff --git a/services/ui/ws/platform_display.h b/services/ui/ws/platform_display.h
index 2209d4503956581b241ed5420caabade84d338c3..05ac17945f01697492d08c9e5a5f46ac20b3b21b 100644
--- a/services/ui/ws/platform_display.h
+++ b/services/ui/ws/platform_display.h
@@ -42,6 +42,7 @@ struct TextInputState;
 namespace ui {
 
 class FrameGenerator;
+class ImageCursors;
 
 namespace ws {
 
@@ -164,7 +165,8 @@ class DefaultPlatformDisplay : public PlatformDisplay,
   display::PlatformScreen* platform_screen_;
 
 #if !defined(OS_ANDROID)
-  std::unique_ptr<ui::CursorLoader> cursor_loader_;
+  // std::unique_ptr<ui::CursorLoader> cursor_loader_;

[sadrul, 2016/08/22 14:39:40]

Remove

[Alex Z., 2016/08/22 15:11:51]

Done.

+  std::unique_ptr<ui::ImageCursors> image_cursors_;
 #endif
 
   PlatformDisplayDelegate* delegate_ = nullptr;