Enable CursorManager::LockCursor to lock cursor visibility.

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/client/cursor_client.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace ash {
 
 namespace test {
 class CursorManagerTestApi;
 }
 
-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 ASH_EXPORT CursorManager : public aura::client::CursorClient {
  public:
   CursorManager();
   virtual ~CursorManager();
 
-  void set_delegate(CursorDelegate* delegate) { delegate_ = delegate; }
-
   // Locks/Unlocks the cursor change.
   void LockCursor();
   void UnlockCursor();

[oshima, 2012/10/09 23:08:38]

Can you define these API in CursorClient? RWHVA needs this feature.

[mazda, 2012/10/10 00:59:12]

Done.
I'd like to add the implementations other than CursorManager after I refactor
CursorManager code furthermore for code sharing.

 
   bool is_cursor_locked() const { return cursor_lock_count_ > 0; }
 
   // Shows or hides the cursor.
   bool cursor_visible() const { return cursor_visible_; }
 
   // Overridden from aura::client::CursorClient:
   virtual void SetCursor(gfx::NativeCursor) OVERRIDE;
   virtual void ShowCursor(bool show) OVERRIDE;
   virtual bool IsCursorVisible() const OVERRIDE;
   virtual void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE;
 
  private:
   friend class test::CursorManagerTestApi;
 
   void SetCursorInternal(gfx::NativeCursor cursor);
-
-  CursorDelegate* delegate_;
+  void ShowCursorInternal(bool show);
 
   // Number of times LockCursor() has been invoked without a corresponding
   // UnlockCursor().
   int cursor_lock_count_;
 
-  // Set to true if UpdateCursor() is invoked while |cursor_lock_count_| == 0.
+  // Set to true if SetCursor() is invoked while |cursor_lock_count_| == 0.
   bool did_cursor_change_;
 
   // Cursor to set once |cursor_lock_count_| is set to 0. Only valid if
   // |did_cursor_change_| is true.
   gfx::NativeCursor cursor_to_set_on_unlock_;
 
+  // Set to true if ShowCursor() is invoked while |cursor_lock_count_| == 0.
+  bool did_visibility_change_;
+
+  // The visibility to set once |cursor_lock_count_| is set to 0. Only valid if
+  // |did_visibility_change_| is true.
+  bool show_on_unlock_;
+
   // Is cursor visible?
   bool cursor_visible_;
 
   // The cursor currently set.
   gfx::NativeCursor current_cursor_;
 
   scoped_ptr<ImageCursors> image_cursors_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorManager);
 };
 
 }  // namespace ash
 
 #endif  // UI_AURA_CURSOR_MANAGER_H_