Rework ash::CursorManager into a corewm object, to share code with desktop.

ash/wm/cursor_manager.h

Index: ash/wm/cursor_manager.h
diff --git a/ash/wm/cursor_manager.h b/ash/wm/cursor_manager.h
index 774e4505082a66cde4a07f648688303a4ff82f65..de9914be60d3e7b8840b6f832ae84abd2cb23feb 100644
--- a/ash/wm/cursor_manager.h
+++ b/ash/wm/cursor_manager.h
@@ -9,16 +9,12 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/client/cursor_client.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
+#include "ui/views/corewm/cursor_controller.h"
 
 namespace ash {
 
-namespace internal {
-class CursorState;
-}
-
 namespace test {
 class CursorManagerTestApi;
 }
@@ -28,48 +24,25 @@ class ImageCursors;
 // This class controls the visibility and the type of the cursor.
 // The cursor type can be locked so that the type stays the same
 // until it's unlocked.
-class ASH_EXPORT CursorManager : public aura::client::CursorClient {
+class ASH_EXPORT CursorManager : public views::corewm::CursorController {
  public:
   CursorManager();
   virtual ~CursorManager();
 
-  bool is_cursor_locked() const { return cursor_lock_count_ > 0; }
-
-  // Overridden from aura::client::CursorClient:
-  virtual void SetCursor(gfx::NativeCursor) OVERRIDE;
-  virtual void ShowCursor() OVERRIDE;
-  virtual void HideCursor() OVERRIDE;
-  virtual bool IsCursorVisible() const OVERRIDE;
-  virtual void EnableMouseEvents() OVERRIDE;
-  virtual void DisableMouseEvents() OVERRIDE;
-  virtual bool IsMouseEventsEnabled() const OVERRIDE;
+  // Overridden from aura::client::CursorClient
   virtual void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE;
-  virtual void LockCursor() OVERRIDE;
-  virtual void UnlockCursor() OVERRIDE;
 
  private:
   friend class test::CursorManagerTestApi;
 
-  void SetCursorInternal(gfx::NativeCursor cursor);
-  void SetCursorVisibility(bool visible);
-  void SetMouseEventsEnabled(bool enabled);
-
-  // Returns the current cursor.
-  gfx::NativeCursor GetCurrentCursor() const;
-
-  // Number of times LockCursor() has been invoked without a corresponding
-  // UnlockCursor().
-  int cursor_lock_count_;
+  // Overridden from views::corewm::CursorController:
+  virtual void SetCursorInternal(gfx::NativeCursor cursor) OVERRIDE;
+  virtual void SetCursorVisibility(bool visible) OVERRIDE;
+  virtual void SetMouseEventsEnabled(bool enabled) OVERRIDE;
 
   // The cursor location where the cursor was disabled.
   gfx::Point disabled_cursor_location_;
 
-  // The current state of the cursor.
-  scoped_ptr<internal::CursorState> current_state_;
-
-  // The cursor state to restore when the cursor is unlocked.
-  scoped_ptr<internal::CursorState> state_on_unlock_;
-
   scoped_ptr<ImageCursors> image_cursors_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorManager);