Linux Aura: Fixes and improvements for cursor loader

ui/views/widget/desktop_aura/desktop_native_cursor_manager.cc

 // 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.
 
 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
 
 #include <utility>
 
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/cursor_loader.h"
-#include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h"
 
 namespace views {
 
-DesktopNativeCursorManager::DesktopNativeCursorManager(
-    std::unique_ptr<DesktopCursorLoaderUpdater> cursor_loader_updater)
-    : cursor_loader_updater_(std::move(cursor_loader_updater)),
-      cursor_loader_(ui::CursorLoader::Create()) {
-  if (cursor_loader_updater_.get())
-    cursor_loader_updater_->OnCreate(1.0f, cursor_loader_.get());
-}
+DesktopNativeCursorManager::DesktopNativeCursorManager()
+    : cursor_loader_(ui::CursorLoader::Create()) {}
 
 DesktopNativeCursorManager::~DesktopNativeCursorManager() {
 }
 
 gfx::NativeCursor DesktopNativeCursorManager::GetInitializedCursor(int type) {
   gfx::NativeCursor cursor(type);
   cursor_loader_->SetPlatformCursor(&cursor);
   return cursor;
 }
 
 void DesktopNativeCursorManager::AddHost(aura::WindowTreeHost* host) {
   hosts_.insert(host);
 }
 
 void DesktopNativeCursorManager::RemoveHost(aura::WindowTreeHost* host) {
   hosts_.erase(host);
 }
 
 void DesktopNativeCursorManager::SetDisplay(
     const display::Display& display,
     wm::NativeCursorManagerDelegate* delegate) {
   cursor_loader_->UnloadAll();
   cursor_loader_->set_rotation(display.rotation());
   cursor_loader_->set_scale(display.device_scale_factor());
 
-  if (cursor_loader_updater_.get())
-    cursor_loader_updater_->OnDisplayUpdated(display, cursor_loader_.get());
-
   SetCursor(delegate->GetCursor(), delegate);
 }
 
 void DesktopNativeCursorManager::SetCursor(
     gfx::NativeCursor cursor,
     wm::NativeCursorManagerDelegate* delegate) {
   gfx::NativeCursor new_cursor = cursor;
   cursor_loader_->SetPlatformCursor(&new_cursor);
   delegate->CommitCursor(new_cursor);
 
@@ skipping 35 matching lines @@
   // TODO(erg): In the ash version, we set the last mouse location on Env. I'm
   // not sure this concept makes sense on the desktop.
 
   SetVisibility(delegate->IsCursorVisible(), delegate);
 
   for (Hosts::const_iterator i = hosts_.begin(); i != hosts_.end(); ++i)
     (*i)->dispatcher()->OnMouseEventsEnableStateChanged(enabled);
 }
 
 }  // namespace views