Linux Aura: Fixes and improvements for cursor loader

ui/views/widget/desktop_aura/desktop_native_cursor_manager.h

 // Copyright (c) 2012 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 UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_
 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_
 
 #include <memory>
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/views/views_export.h"
 #include "ui/wm/core/native_cursor_manager.h"
 
 namespace aura {
 class WindowTreeHost;
 }
 
 namespace ui {
 class CursorLoader;
 }
 
 namespace wm {
 class NativeCursorManagerDelegate;
 }
 
 namespace views {
-class DesktopCursorLoaderUpdater;
 
 // A NativeCursorManager that performs the desktop-specific setting of cursor
 // state. Similar to AshNativeCursorManager, it also communicates these changes
 // to all root windows.
 class VIEWS_EXPORT DesktopNativeCursorManager
     : public wm::NativeCursorManager {
  public:
-  DesktopNativeCursorManager(
-      std::unique_ptr<DesktopCursorLoaderUpdater> cursor_loader_updater);
+  DesktopNativeCursorManager();
   ~DesktopNativeCursorManager() override;
 
   // Builds a cursor and sets the internal platform representation. The return
   // value should not be cached.
   gfx::NativeCursor GetInitializedCursor(int type);
 
   // Adds |host| to the set |hosts_|.
   void AddHost(aura::WindowTreeHost* host);
 
   // Removes |host| from the set |hosts_|.
@@ skipping 10 matching lines @@
   void SetCursorSet(ui::CursorSetType cursor_set,
                     wm::NativeCursorManagerDelegate* delegate) override;
   void SetMouseEventsEnabled(
       bool enabled,
       wm::NativeCursorManagerDelegate* delegate) override;
 
   // The set of hosts to notify of changes in cursor state.
   typedef std::set<aura::WindowTreeHost*> Hosts;
   Hosts hosts_;
 
-  std::unique_ptr<DesktopCursorLoaderUpdater> cursor_loader_updater_;
   std::unique_ptr<ui::CursorLoader> cursor_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNativeCursorManager);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_CURSOR_MANAGER_H_
-