Cursor state should be global for all CursorManagers

ui/views/corewm/cursor_manager.h

Index: ui/views/corewm/cursor_manager.h
diff --git a/ui/views/corewm/cursor_manager.h b/ui/views/corewm/cursor_manager.h
index 1706ed8f7af5836f9c55e8b75393d3fd4d076abf..9ce124f02515a5cb26e7b478a0ce6985a7c490ce 100644
--- a/ui/views/corewm/cursor_manager.h
+++ b/ui/views/corewm/cursor_manager.h
@@ -39,15 +39,19 @@ class VIEWS_EXPORT CursorManager : public aura::client::CursorClient,
   CursorManager(scoped_ptr<NativeCursorManager> delegate);
   virtual ~CursorManager();
 
+  // Used only for tests.

[sky, 2013/12/05 01:32:43]

Move this into a test api.

[tdanderson, 2013/12/05 23:07:41]

Done.

+  void ResetState();
+
   // Overridden from aura::client::CursorClient:
   virtual void SetCursor(gfx::NativeCursor) OVERRIDE;
+  virtual gfx::NativeCursor GetCursor() const OVERRIDE;
   virtual void ShowCursor() OVERRIDE;
   virtual void HideCursor() OVERRIDE;
   virtual bool IsCursorVisible() const OVERRIDE;
   virtual void SetScale(float scale) OVERRIDE;
-  virtual float GetCurrentScale() const OVERRIDE;
+  virtual float GetScale() const OVERRIDE;
   virtual void SetCursorSet(ui::CursorSetType cursor_set) OVERRIDE;
-  virtual ui::CursorSetType GetCurrentCursorSet() const OVERRIDE;
+  virtual ui::CursorSetType GetCursorSet() const OVERRIDE;
   virtual void EnableMouseEvents() OVERRIDE;
   virtual void DisableMouseEvents() OVERRIDE;
   virtual bool IsMouseEventsEnabled() const OVERRIDE;
@@ -62,9 +66,6 @@ class VIEWS_EXPORT CursorManager : public aura::client::CursorClient,
 
  private:
   // Overridden from NativeCursorManagerDelegate:
-  virtual gfx::NativeCursor GetCurrentCursor() const OVERRIDE;
-  virtual bool GetCurrentVisibility() const OVERRIDE;
-  virtual bool GetMouseEventsEnabled() const OVERRIDE;
   virtual void CommitCursor(gfx::NativeCursor cursor) OVERRIDE;
   virtual void CommitVisibility(bool visible) OVERRIDE;
   virtual void CommitScale(float scale) OVERRIDE;
@@ -75,15 +76,15 @@ class VIEWS_EXPORT CursorManager : public aura::client::CursorClient,
 
   // Number of times LockCursor() has been invoked without a corresponding
   // UnlockCursor().
-  int cursor_lock_count_;
+  static int cursor_lock_count_;
 
   // The current state of the cursor.
-  scoped_ptr<internal::CursorState> current_state_;
+  static scoped_ptr<internal::CursorState> current_state_;

[sky, 2013/12/05 01:32:43]

Style guide says static most be of type POD, not objects like this or
ObserverList below.

[tdanderson, 2013/12/05 23:07:41]

Done.

 
   // The cursor state to restore when the cursor is unlocked.
-  scoped_ptr<internal::CursorState> state_on_unlock_;
+  static scoped_ptr<internal::CursorState> state_on_unlock_;
 
-  ObserverList<aura::client::CursorClientObserver> observers_;
+  static ObserverList<aura::client::CursorClientObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorManager);
 };