app_shell: Add support for mouse cursors.

ui/base/cursor/image_cursors.cc

Index: ui/base/cursor/image_cursors.cc
diff --git a/ash/wm/image_cursors.cc b/ui/base/cursor/image_cursors.cc
similarity index 50%
rename from ash/wm/image_cursors.cc
rename to ui/base/cursor/image_cursors.cc
index 2a41375d19658c8ea9a437a775cf96f8391da808..1261ceb305a4644c75a6814d9c216afa853935d3 100644
--- a/ash/wm/image_cursors.cc
+++ b/ui/base/cursor/image_cursors.cc
@@ -2,13 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/image_cursors.h"
+#include "ui/base/cursor/image_cursors.h"
 
 #include <float.h>
 
-#include "ash/display/display_info.h"
-#include "ash/display/display_manager.h"
-#include "ash/shell.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "ui/base/cursor/cursor.h"
@@ -17,49 +14,53 @@
 #include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
 
-namespace ash {
+namespace ui {
+
+namespace {
 
 const int kImageCursorIds[] = {
-  ui::kCursorNull,
-  ui::kCursorPointer,
-  ui::kCursorNoDrop,
-  ui::kCursorNotAllowed,
-  ui::kCursorCopy,
-  ui::kCursorHand,
-  ui::kCursorMove,
-  ui::kCursorNorthEastResize,
-  ui::kCursorSouthWestResize,
-  ui::kCursorSouthEastResize,
-  ui::kCursorNorthWestResize,
-  ui::kCursorNorthResize,
-  ui::kCursorSouthResize,
-  ui::kCursorEastResize,
-  ui::kCursorWestResize,
-  ui::kCursorIBeam,
-  ui::kCursorAlias,
-  ui::kCursorCell,
-  ui::kCursorContextMenu,
-  ui::kCursorCross,
-  ui::kCursorHelp,
-  ui::kCursorVerticalText,
-  ui::kCursorZoomIn,
-  ui::kCursorZoomOut,
-  ui::kCursorRowResize,
-  ui::kCursorColumnResize,
-  ui::kCursorEastWestResize,
-  ui::kCursorNorthSouthResize,
-  ui::kCursorNorthEastSouthWestResize,
-  ui::kCursorNorthWestSouthEastResize,
-  ui::kCursorGrab,
-  ui::kCursorGrabbing,
+  kCursorNull,
+  kCursorPointer,
+  kCursorNoDrop,
+  kCursorNotAllowed,
+  kCursorCopy,
+  kCursorHand,
+  kCursorMove,
+  kCursorNorthEastResize,
+  kCursorSouthWestResize,
+  kCursorSouthEastResize,
+  kCursorNorthWestResize,
+  kCursorNorthResize,
+  kCursorSouthResize,
+  kCursorEastResize,
+  kCursorWestResize,
+  kCursorIBeam,
+  kCursorAlias,
+  kCursorCell,
+  kCursorContextMenu,
+  kCursorCross,
+  kCursorHelp,
+  kCursorVerticalText,
+  kCursorZoomIn,
+  kCursorZoomOut,
+  kCursorRowResize,
+  kCursorColumnResize,
+  kCursorEastWestResize,
+  kCursorNorthSouthResize,
+  kCursorNorthEastSouthWestResize,
+  kCursorNorthWestSouthEastResize,
+  kCursorGrab,
+  kCursorGrabbing,
 };
 
 const int kAnimatedCursorIds[] = {
-  ui::kCursorWait,
-  ui::kCursorProgress
+  kCursorWait,
+  kCursorProgress
 };
 
-ImageCursors::ImageCursors() : cursor_set_(ui::CURSOR_SET_NORMAL) {
+}  // namespace
+
+ImageCursors::ImageCursors() : cursor_set_(CURSOR_SET_NORMAL) {
 }
 
 ImageCursors::~ImageCursors() {
@@ -85,15 +86,10 @@ gfx::Display::Rotation ImageCursors::GetRotation() const {
   return cursor_loader_->rotation();
 }
 
-bool ImageCursors::SetDisplay(const gfx::Display& display) {
-  DCHECK(display.is_valid());
-  // Use the platform's device scale factor instead of display's
-  // that might have been adjusted for UI scale.
-  float scale_factor = Shell::GetInstance()->display_manager()->
-      GetDisplayInfo(display.id()).device_scale_factor();
-
+bool ImageCursors::SetDisplay(const gfx::Display& display,
+                              float scale_factor) {
   if (!cursor_loader_) {
-    cursor_loader_.reset(ui::CursorLoader::Create());
+    cursor_loader_.reset(CursorLoader::Create());
   } else if (cursor_loader_->rotation() == display.rotation() &&
              cursor_loader_->scale() == scale_factor) {
     return false;
@@ -113,31 +109,31 @@ void ImageCursors::ReloadCursors() {
   for (size_t i = 0; i < arraysize(kImageCursorIds); ++i) {
     int resource_id = -1;
     gfx::Point hot_point;
-    bool success = ui::GetCursorDataFor(cursor_set_,
-                                        kImageCursorIds[i],
-                                        device_scale_factor,
-                                        &resource_id,
-                                        &hot_point);
+    bool success = GetCursorDataFor(cursor_set_,
+                                    kImageCursorIds[i],
+                                    device_scale_factor,
+                                    &resource_id,
+                                    &hot_point);
     DCHECK(success);
     cursor_loader_->LoadImageCursor(kImageCursorIds[i], resource_id, hot_point);
   }
   for (size_t i = 0; i < arraysize(kAnimatedCursorIds); ++i) {
     int resource_id = -1;
     gfx::Point hot_point;
-    bool success = ui::GetAnimatedCursorDataFor(cursor_set_,
-                                                kAnimatedCursorIds[i],
-                                                device_scale_factor,
-                                                &resource_id,
-                                                &hot_point);
+    bool success = GetAnimatedCursorDataFor(cursor_set_,
+                                            kAnimatedCursorIds[i],
+                                            device_scale_factor,
+                                            &resource_id,
+                                            &hot_point);
     DCHECK(success);
     cursor_loader_->LoadAnimatedCursor(kAnimatedCursorIds[i],
                                        resource_id,
                                        hot_point,
-                                       ui::kAnimatedCursorFrameDelayMs);
+                                       kAnimatedCursorFrameDelayMs);
   }
 }
 
-void ImageCursors::SetCursorSet(ui::CursorSetType cursor_set) {
+void ImageCursors::SetCursorSet(CursorSetType cursor_set) {
   if (cursor_set_ == cursor_set)
     return;
 
@@ -151,4 +147,4 @@ void ImageCursors::SetPlatformCursor(gfx::NativeCursor* cursor) {
   cursor_loader_->SetPlatformCursor(cursor);
 }
 
-}  // namespace ash
+}  // namespace ui