Cursor state should be global for all CursorManagers

ui/views/corewm/cursor_manager.h

 // Copyright (c) 2013 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 UI_VIEWS_COREWM_CURSOR_MANAGER_H_
 #define UI_VIEWS_COREWM_CURSOR_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 21 matching lines @@
 // This class receives requests to change cursor properties, as well as
 // requests to queue any further changes until a later time. It sends changes
 // to the NativeCursorManager, which communicates back to us when these changes
 // were made through the NativeCursorManagerDelegate interface.
 class VIEWS_EXPORT CursorManager : public aura::client::CursorClient,
                                    public NativeCursorManagerDelegate {
  public:
   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;
   virtual void SetDisplay(const gfx::Display& display) OVERRIDE;
   virtual void LockCursor() OVERRIDE;
   virtual void UnlockCursor() OVERRIDE;
   virtual bool IsCursorLocked() const OVERRIDE;
   virtual void AddObserver(
       aura::client::CursorClientObserver* observer) OVERRIDE;
   virtual void RemoveObserver(
       aura::client::CursorClientObserver* observer) OVERRIDE;
 
  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;
   virtual void CommitCursorSet(ui::CursorSetType cursor_set) OVERRIDE;
   virtual void CommitMouseEventsEnabled(bool enabled) OVERRIDE;
 
   scoped_ptr<NativeCursorManager> delegate_;
 
   // 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);
 };
 
 }  // namespace corewm
 }  // namespace views
 
 #endif  // UI_VIEWS_COREWM_CURSOR_MANAGER_H_