diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 14:14:24 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 14:14:24 +0000 |
| commit | 662d091e3a9f13158274577f0ddc94f424e39959 (patch) | |
| tree | 369efe7bcb7eada253b2a544df3df0b0a4b54ffd /remoting/host/desktop_session_agent.cc | |
| parent | 8f72269f2b1e3bfe229ba26612aef17c8f1a6f52 (diff) | |
| download | chromium_src-662d091e3a9f13158274577f0ddc94f424e39959.zip chromium_src-662d091e3a9f13158274577f0ddc94f424e39959.tar.gz chromium_src-662d091e3a9f13158274577f0ddc94f424e39959.tar.bz2 | |
Switch Pepper Linux to use shared USB<->native key conversion table.
This fixes issues with the Linux table lagging behind the shared version, and:
- Marks the UsbKeycodeToNativeKeycode helper "inline", for now, to avoid the warning on unused static functions, and since it is sufficiently simple to make sense to inline.
- Tweaks the types of the array iterator in the other platform-specific implementations.
BUG=177278,118432,165704
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=183841
Review URL: https://chromiumcodereview.appspot.com/12320014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184318 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/desktop_session_agent.cc')
| -rw-r--r-- | remoting/host/desktop_session_agent.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc index 6f0996e..cd47677 100644 --- a/remoting/host/desktop_session_agent.cc +++ b/remoting/host/desktop_session_agent.cc @@ -437,7 +437,8 @@ void DesktopSessionAgent::OnInjectKeyEvent( // Ignore unknown keycodes. if (event.has_usb_keycode() && - UsbKeycodeToNativeKeycode(event.usb_keycode()) == kInvalidKeycode) { + (UsbKeycodeToNativeKeycode(event.usb_keycode()) == + InvalidNativeKeycode())) { LOG(ERROR) << "KeyEvent: unknown USB keycode: " << std::hex << event.usb_keycode() << std::dec; return; |