Aura desktop: Show resize cursors again.

ash/wm/cursor_manager.h

Index: ash/wm/cursor_manager.h
diff --git a/ui/aura/cursor_manager.h b/ash/wm/cursor_manager.h
similarity index 72%
rename from ui/aura/cursor_manager.h
rename to ash/wm/cursor_manager.h
index 84e4207c82838cedc9a5015ceb27814738c6a1c3..84783f2641b40484f25d94e1ff37b23160f685be 100644
--- a/ui/aura/cursor_manager.h
+++ b/ash/wm/cursor_manager.h
@@ -2,20 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_CURSOR_MANAGER_H_
-#define UI_AURA_CURSOR_MANAGER_H_
+#ifndef ASH_WM_CURSOR_MANAGER_H_
+#define ASH_WM_CURSOR_MANAGER_H_
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "ui/aura/aura_export.h"
+#include "ui/aura/client/cursor_client.h"
 #include "ui/gfx/native_widget_types.h"
 
-namespace aura {
+namespace ash {
 class CursorDelegate;
 
 // 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 AURA_EXPORT CursorManager {
+class CursorManager : public aura::client::CursorClient {
  public:
   CursorManager();
   ~CursorManager();
@@ -26,12 +28,13 @@ class AURA_EXPORT CursorManager {
   void LockCursor();
   void UnlockCursor();
 
-  void SetCursor(gfx::NativeCursor);
-
-  // Shows or hides the cursor.
-  void ShowCursor(bool show);
   bool cursor_visible() const { return cursor_visible_; }
 
+  // Overridden from aura::CursorClient:
+  virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
+  virtual void ShowCursor(bool visible) OVERRIDE;
+  virtual bool GetVisible() const OVERRIDE;
+
  private:
   CursorDelegate* delegate_;
 
@@ -52,7 +55,7 @@ class AURA_EXPORT CursorManager {
   DISALLOW_COPY_AND_ASSIGN(CursorManager);
 };
 
-}  // namespace aura
+}  // namespace ash
 
-#endif  // UI_AURA_CURSOR_MANAGER_H_
+#endif  // ASH_WM_CURSOR_MANAGER_H_