Replaced CursorLoader in PlatformDisplay with a ImageCursor

services/ui/ws/display.cc

 // Copyright 2015 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.
 
 #include "services/ui/ws/display.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 259 matching lines @@
       std::move(display_root_ptr);
   display_root->window_manager_state_ =
       factory->window_tree()->window_manager_state();
   const bool is_active =
       factory->user_id() == window_server_->user_id_tracker()->active_id();
   display_root->root()->SetVisible(is_active);
   display_root->window_manager_state()->window_tree()->AddRootForWindowManager(
       display_root->root());
 }
 
+display::Display Display::GetDisplay() {
+  return ToDisplay();
+}
+
 ServerWindow* Display::GetRootWindow() {
   return root_.get();
 }
 
 bool Display::IsInHighContrastMode() {
   return window_server_->IsActiveUserInHighContrastMode();
 }
 
 void Display::OnEvent(const ui::Event& event) {
   WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
@@ skipping 130 matching lines @@
 }
 
 void Display::OnWindowManagerWindowTreeFactoryReady(
     WindowManagerWindowTreeFactory* factory) {
   if (!binding_)
     CreateWindowManagerDisplayRootFromFactory(factory);
 }
 
 }  // namespace ws
 }  // namespace ui