Chromium Code Reviews| Index: media/base/user_input_monitor.h |
| diff --git a/media/base/user_input_monitor.h b/media/base/user_input_monitor.h |
| index 4a8777dc6c336240917a735a770c80129284159c..c6fb974879907d559006596a58c234e29696fdcc 100644 |
| --- a/media/base/user_input_monitor.h |
| +++ b/media/base/user_input_monitor.h |
| @@ -11,36 +11,20 @@ |
| #include "base/macros.h" |
| #include "base/memory/ref_counted.h" |
| -#include "base/observer_list_threadsafe.h" |
| #include "base/synchronization/lock.h" |
| #include "media/base/media_export.h" |
| -struct SkIPoint; |
| - |
| namespace base { |
| class SingleThreadTaskRunner; |
| } // namespace base |
| namespace media { |
| -// Monitors and notifies about mouse movements and keyboard events. |
| -// Thread safe. The listeners are called on the thread where the listeners are |
| -// added. |
| +// Monitors and notifies about keyboard events. |
| +// Thread safe. |
| class MEDIA_EXPORT UserInputMonitor { |
| public: |
| - // The interface to receive mouse movement events. |
| - class MEDIA_EXPORT MouseEventListener { |
| - public: |
| - // |position| is the new mouse position. |
| - virtual void OnMouseMoved(const SkIPoint& position) = 0; |
| - |
| - protected: |
| - virtual ~MouseEventListener() {} |
| - }; |
| - typedef base::ObserverListThreadSafe<UserInputMonitor::MouseEventListener> |
| - MouseListenerList; |
| - |
| - UserInputMonitor(); |
| + UserInputMonitor() : key_press_counter_references_(0) {} |
|
xhwang
2017/01/10 20:13:16
wez: The style guide recommends inlining construct
Wez
2017/01/10 23:19:24
I agree, it's probably best to keep the constructo
CJ
2017/01/11 21:40:27
Done.
|
| virtual ~UserInputMonitor(); |
| // Creates a platform-specific instance of UserInputMonitor. |
| @@ -50,12 +34,6 @@ class MEDIA_EXPORT UserInputMonitor { |
| const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner, |
| const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner); |
| - // The same |listener| should only be added once. |
| - // The clients should make sure to call Remove*Listener before |listener| is |
| - // destroyed. |
| - void AddMouseListener(MouseEventListener* listener); |
| - void RemoveMouseListener(MouseEventListener* listener); |
| - |
| // A caller must call EnableKeyPressMonitoring and |
| // DisableKeyPressMonitoring in pair. |
| void EnableKeyPressMonitoring(); |
| @@ -69,21 +47,12 @@ class MEDIA_EXPORT UserInputMonitor { |
| // any assumption on the initial value. |
| virtual size_t GetKeyPressCount() const = 0; |
| - protected: |
| - scoped_refptr<MouseListenerList> mouse_listeners() { |
| - return mouse_listeners_; |
| - } |
| - |
| private: |
| virtual void StartKeyboardMonitoring() = 0; |
| virtual void StopKeyboardMonitoring() = 0; |
| - virtual void StartMouseMonitoring() = 0; |
| - virtual void StopMouseMonitoring() = 0; |
| base::Lock lock_; |
| size_t key_press_counter_references_; |
| - size_t mouse_listeners_count_; |
| - scoped_refptr<MouseListenerList> mouse_listeners_; |
| DISALLOW_COPY_AND_ASSIGN(UserInputMonitor); |
| }; |