diff options
author | rouslan@chromium.org <rouslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-14 11:48:10 +0000 |
---|---|---|
committer | rouslan@chromium.org <rouslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-14 11:48:10 +0000 |
commit | 1e631cd11e5b065a75d7d5cfe129ddeb86d50bfd (patch) | |
tree | 5a229fa1fc8d4a1fceabba3bc9c0c78502abef57 /media/base/user_input_monitor_mac.cc | |
parent | 694285768a5578cbc14bac4ffd8ff51899914627 (diff) | |
download | chromium_src-1e631cd11e5b065a75d7d5cfe129ddeb86d50bfd.zip chromium_src-1e631cd11e5b065a75d7d5cfe129ddeb86d50bfd.tar.gz chromium_src-1e631cd11e5b065a75d7d5cfe129ddeb86d50bfd.tar.bz2 |
Revert 223223 "Adds the UserInputMonitor implementation for Wind..."
The change appears to have broken media_unittests on Linux ASAN Tests
build-bot.
http://build.chromium.org/p/chromium.memory/builders/Linux%20ASAN%20Tests%20%282%29/builds/17313
Please see http://www.chromium.org/developers/testing/addresssanitizer for
details on how to setup ASAN on your machine. The linux_asan try-bot can
also be helpful.
> Adds the UserInputMonitor implementation for Windows.
>
> BUG=274623
>
> Review URL: https://chromiumcodereview.appspot.com/23702008
TBR=jiayl@chromium.org
Review URL: https://codereview.chromium.org/23514059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/user_input_monitor_mac.cc')
-rw-r--r-- | media/base/user_input_monitor_mac.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/base/user_input_monitor_mac.cc b/media/base/user_input_monitor_mac.cc index f70ee4d..3d19134 100644 --- a/media/base/user_input_monitor_mac.cc +++ b/media/base/user_input_monitor_mac.cc @@ -17,10 +17,10 @@ class UserInputMonitorMac : public UserInputMonitor { virtual size_t GetKeyPressCount() const OVERRIDE; private: - virtual void StartKeyboardMonitoring() OVERRIDE; - virtual void StopKeyboardMonitoring() OVERRIDE; virtual void StartMouseMonitoring() OVERRIDE; virtual void StopMouseMonitoring() OVERRIDE; + virtual void StartKeyboardMonitoring() OVERRIDE; + virtual void StopKeyboardMonitoring() OVERRIDE; DISALLOW_COPY_AND_ASSIGN(UserInputMonitorMac); }; @@ -36,16 +36,16 @@ size_t UserInputMonitorMac::GetKeyPressCount() const { kCGEventKeyDown); } -void UserInputMonitorMac::StartKeyboardMonitoring() {} - -void UserInputMonitorMac::StopKeyboardMonitoring() {} - // TODO(jiayl): add the impl. void UserInputMonitorMac::StartMouseMonitoring() { NOTIMPLEMENTED(); } // TODO(jiayl): add the impl. void UserInputMonitorMac::StopMouseMonitoring() { NOTIMPLEMENTED(); } +void UserInputMonitorMac::StartKeyboardMonitoring() {} + +void UserInputMonitorMac::StopKeyboardMonitoring() {} + } // namespace scoped_ptr<UserInputMonitor> UserInputMonitor::Create( |