app_shell: Add support for mouse cursors.

ash/wm/ash_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 "ash/wm/ash_native_cursor_manager.h"
 
 #include "ash/display/cursor_window_controller.h"
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
-#include "ash/wm/image_cursors.h"
 #include "base/logging.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/cursor.h"
+#include "ui/base/cursor/image_cursors.h"
 
 namespace ash {
 namespace  {
 
 void SetCursorOnAllRootWindows(gfx::NativeCursor cursor) {
   aura::Window::Windows root_windows =
       Shell::GetInstance()->GetAllRootWindows();
   for (aura::Window::Windows::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->GetHost()->SetCursor(cursor);
@@ skipping 21 matching lines @@
   for (aura::Window::Windows::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->GetHost()->dispatcher()->OnMouseEventsEnableStateChanged(enabled);
   // Mirror window never process events.
 }
 
 }  // namespace
 
 AshNativeCursorManager::AshNativeCursorManager()
     : native_cursor_enabled_(true),
-      image_cursors_(new ImageCursors) {
+      image_cursors_(new ui::ImageCursors) {
 }
 
 AshNativeCursorManager::~AshNativeCursorManager() {
 }
 
 
 void AshNativeCursorManager::SetNativeCursorEnabled(bool enabled) {
   native_cursor_enabled_ = enabled;
 
   ::wm::CursorManager* cursor_manager =
       Shell::GetInstance()->cursor_manager();
   SetCursor(cursor_manager->GetCursor(), cursor_manager);
 }
 
 void AshNativeCursorManager::SetDisplay(
     const gfx::Display& display,
     ::wm::NativeCursorManagerDelegate* delegate) {
-  if (image_cursors_->SetDisplay(display))
+  DCHECK(display.is_valid());
+  // Use the platform's device scale factor instead of the display's, which
+  // might have been adjusted for the UI scale.
+  const float scale_factor = Shell::GetInstance()->display_manager()->
+      GetDisplayInfo(display.id()).device_scale_factor();
+  if (image_cursors_->SetDisplay(display, scale_factor))
     SetCursor(delegate->GetCursor(), delegate);
 #if defined(OS_CHROMEOS)
   Shell::GetInstance()->display_controller()->cursor_window_controller()->
       SetDisplay(display);
 #endif
 }
 
 void AshNativeCursorManager::SetCursor(
     gfx::NativeCursor cursor,
     ::wm::NativeCursorManagerDelegate* delegate) {
-  gfx::NativeCursor new_cursor = cursor;

[Daniel Erat, 2014/04/28 13:15:12]

mazda@, just to double-check: i think that you originally added this copy in
https://chromiumcodereview.appspot.com/11412315. is it safe to remove it, as i'm
doing here?

   if (native_cursor_enabled_) {
-    image_cursors_->SetPlatformCursor(&new_cursor);
+    image_cursors_->SetPlatformCursor(&cursor);
   } else {
     gfx::NativeCursor invisible_cursor(ui::kCursorNone);
     image_cursors_->SetPlatformCursor(&invisible_cursor);
-    if (new_cursor == ui::kCursorCustom) {
-      new_cursor = invisible_cursor;
+    if (cursor == ui::kCursorCustom) {
+      cursor = invisible_cursor;
     } else {
-      new_cursor.SetPlatformCursor(invisible_cursor.platform());
+      cursor.SetPlatformCursor(invisible_cursor.platform());
     }
   }
-  new_cursor.set_device_scale_factor(image_cursors_->GetScale());
+  cursor.set_device_scale_factor(image_cursors_->GetScale());
 
-  delegate->CommitCursor(new_cursor);
+  delegate->CommitCursor(cursor);
 
   if (delegate->IsCursorVisible())
-    SetCursorOnAllRootWindows(new_cursor);
+    SetCursorOnAllRootWindows(cursor);
 }
 
 void AshNativeCursorManager::SetCursorSet(
     ui::CursorSetType cursor_set,
     ::wm::NativeCursorManagerDelegate* delegate) {
   image_cursors_->SetCursorSet(cursor_set);
   delegate->CommitCursorSet(cursor_set);
 
   // Sets the cursor to reflect the scale change immediately.
   if (delegate->IsCursorVisible())
@@ skipping 31 matching lines @@
         disabled_cursor_location_);
   } else {
     disabled_cursor_location_ = aura::Env::GetInstance()->last_mouse_location();
   }
 
   SetVisibility(delegate->IsCursorVisible(), delegate);
   NotifyMouseEventsEnableStateChange(enabled);
 }
 
 }  // namespace ash