| Index: ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
|
| diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
|
| index b7ca1135243811603191984bb07320970e879313..4cb089c63f0a0fa1d3d1e591507a35daf4dbcee0 100644
|
| --- a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
|
| +++ b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/strings/stringprintf.h"
|
| #include "base/timer/timer.h"
|
| #include "ui/events/event.h"
|
| +#include "ui/events/keycodes/dom4/keycode_converter.h"
|
| #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
|
| #include "ui/events/ozone/evdev/event_device_info.h"
|
| #include "ui/events/ozone/evdev/event_device_util.h"
|
| @@ -235,6 +236,15 @@ void GestureInterpreterLibevdevCros::OnLibEvdevCrosEvent(Evdev* evdev,
|
| GestureInterpreterPushHardwareState(interpreter_, &hwstate);
|
| }
|
|
|
| +void GestureInterpreterLibevdevCros::SetAllowedKeys(
|
| + scoped_ptr<std::set<DomCode>> allowed_keys) {
|
| + allowed_keys_ = allowed_keys.Pass();
|
| +}
|
| +
|
| +void GestureInterpreterLibevdevCros::AllowAllKeys() {
|
| + allowed_keys_.reset();
|
| +}
|
| +
|
| void GestureInterpreterLibevdevCros::OnGestureReady(const Gesture* gesture) {
|
| switch (gesture->type) {
|
| case kGestureTypeMove:
|
| @@ -475,6 +485,11 @@ void GestureInterpreterLibevdevCros::DispatchChangedKeys(Evdev* evdev,
|
| if (key >= BTN_DIGI && key < BTN_WHEEL)
|
| continue;
|
|
|
| + DomCode key_code = KeycodeConverter::NativeKeycodeToDomCode(
|
| + KeyboardEvdev::EvdevCodeToNativeCode(key));
|
| + if (allowed_keys_ && !allowed_keys_->count(key_code))
|
| + continue;
|
| +
|
| // Dispatch key press or release to keyboard.
|
| keyboard_->OnKeyChange(key, value);
|
| }
|
|
|