Revert of Use platform's device scale factor for cursor

ash/wm/image_cursors.h

Index: ash/wm/image_cursors.h
diff --git a/ash/wm/image_cursors.h b/ash/wm/image_cursors.h
index 1a75f40a9e3ad14bfedc72e6b3b61f2f508855f2..55bc34c0c44679063832593fe4e24f5ee94d4fe6 100644
--- a/ash/wm/image_cursors.h
+++ b/ash/wm/image_cursors.h
@@ -9,8 +9,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "ui/base/cursor/cursor.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
+
+namespace gfx {
+class Display;
+}
 
 namespace ui {
 class CursorLoader;
@@ -25,15 +28,18 @@
   ImageCursors();
   ~ImageCursors();
 
-  // Returns the scale and rotation of the currently loaded cursor.
-  float GetScale() const;
-  gfx::Display::Rotation GetRotation() const;
+  // Returns the display the cursors are loaded for. The display must
+  // be set by SetDisplay before using this.
+  gfx::Display GetDisplay() const;
 
   // Sets the display the cursors are loaded for. The device scale factor
   // determines the size of the image to load, and the rotation of the display
   // determines if the image and its host point has to be retated.
   // Returns true if the cursor image is reloaded.
   bool SetDisplay(const gfx::Display& display);
+
+  // Sets the scale of the mouse cursor icon.
+  void SetScale(float scale);
 
   // Sets the type of the mouse cursor icon.
   void SetCursorSet(ui::CursorSetType cursor_set);
@@ -46,6 +52,7 @@
   void ReloadCursors();
 
   scoped_ptr<ui::CursorLoader> cursor_loader_;
+  float scale_;
   ui::CursorSetType cursor_set_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageCursors);