Fix cursor getting invisible after moving a window.

ash/wm/cursor_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_WM_CURSOR_MANAGER_H_
 #define ASH_WM_CURSOR_MANAGER_H_
 
+#include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/aura_export.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace ash {
 class CursorDelegate;
 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 CursorManager : public aura::client::CursorClient {
+class ASH_EXPORT CursorManager : public aura::client::CursorClient {
  public:
+  class ASH_EXPORT TestApi {

[sky, 2012/09/20 20:46:27]

Can you put this in a separate file so it isn't cluttering up CursorManager.

[mazda, 2012/09/20 21:13:40]

Changed as follows:
- only declare TestApi here.
- moved the implementation to cursor_manager_unittest.cc 

+   public:
+    explicit TestApi(CursorManager* cursor_manager);
+
+    gfx::NativeCursor GetCurrentCursor();
+    float GetDeviceScaleFactor();
+
+   private:
+    CursorManager* cursor_manager_;  // not owned
+
+    DISALLOW_COPY_AND_ASSIGN(TestApi);
+  };
+
   CursorManager();
   virtual ~CursorManager();
 
   void set_delegate(CursorDelegate* delegate) { delegate_ = delegate; }
 
   // Locks/Unlocks the cursor change.
   void LockCursor();
   void UnlockCursor();
 
   bool is_cursor_locked() const { return cursor_lock_count_ > 0; }
@@ skipping 30 matching lines @@
   gfx::NativeCursor current_cursor_;
 
   scoped_ptr<ImageCursors> image_cursors_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorManager);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_CURSOR_MANAGER_H_