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

ui/views/widget/desktop_aura/desktop_cursor_client.h

Index: ui/views/widget/desktop_aura/desktop_cursor_client.h
diff --git a/ui/views/widget/desktop_aura/desktop_cursor_client.h b/ui/views/widget/desktop_aura/desktop_cursor_client.h
index 18116969dfda8162ea83acd541b22ce413cc7b67..7aaf071f39e80eca668da6d3902d7e0b39bb4381 100644
--- a/ui/views/widget/desktop_aura/desktop_cursor_client.h
+++ b/ui/views/widget/desktop_aura/desktop_cursor_client.h
@@ -8,6 +8,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/cursor_client.h"
+#include "ui/views/corewm/cursor_controller.h"
 #include "ui/views/views_export.h"
 
 namespace aura {
@@ -22,32 +23,24 @@ namespace views {
 
 // A CursorClient that interacts with only one RootWindow. (Unlike the one in
 // ash, which interacts with all the RootWindows.)
-class VIEWS_EXPORT DesktopCursorClient : public aura::client::CursorClient {
+class VIEWS_EXPORT DesktopCursorClient

[Ben Goodger (Google), 2013/02/15 23:02:08]

I think I'd prefer the model here to follow the one I use for focus rules with
the FocusController.

Rather than subclassing a CoreWM type (you know how I feel about subclassing)...
you would instead define a small delegate interface in CoreWM that
CursorController would talk to. That would be implemented by this object (no
longer DesktopCursorClient but instead just DesktopCursorDelegate) and
ash::CursorManager (now ash::CursorDelegate). That keeps the relationship has-a
rather than is-a.

+    : public views::corewm::CursorController {
  public:
   explicit DesktopCursorClient(aura::RootWindow* window);
   virtual ~DesktopCursorClient();
 
   // Overridden from client::CursorClient:
-  virtual void SetCursor(gfx::NativeCursor cursor) 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;
   virtual void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE;
-  virtual void LockCursor() OVERRIDE;
-  virtual void UnlockCursor() OVERRIDE;
 
  private:
-  void SetCursorVisibility(bool visible);
+  // Overridden from views::corewm::CursorController:
+  virtual void SetCursorInternal(gfx::NativeCursor cursor) OVERRIDE;
+  virtual void SetCursorVisibility(bool visible) OVERRIDE;
+  virtual void SetMouseEventsEnabled(bool enabled) OVERRIDE;
 
   aura::RootWindow* root_window_;
   scoped_ptr<ui::CursorLoader> cursor_loader_;
 
-  gfx::NativeCursor current_cursor_;
-  bool cursor_visible_;
-
   DISALLOW_COPY_AND_ASSIGN(DesktopCursorClient);
 };