| Index: ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
|
| diff --git a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
|
| index aeed7914f908c1c5e03a4f27141560977cc0adb5..bdbbc545e8084f8e3c75caf886d9eb347ffddcb9 100644
|
| --- a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
|
| +++ b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
|
| @@ -33,6 +33,7 @@ EventReaderLibevdevCros::EventReaderLibevdevCros(int fd,
|
| scoped_ptr<Delegate> delegate)
|
| : EventConverterEvdev(fd, path, id, type),
|
| has_keyboard_(devinfo.HasKeyboard()),
|
| + has_touchpad_(devinfo.HasTouchpad()),
|
| delegate_(delegate.Pass()) {
|
| memset(&evdev_, 0, sizeof(evdev_));
|
| evdev_.log = OnLogMessage;
|
| @@ -68,15 +69,33 @@ void EventReaderLibevdevCros::OnFileCanReadWithoutBlocking(int fd) {
|
| }
|
| }
|
|
|
| +void EventReaderLibevdevCros::SetAllowedKeys(
|
| + scoped_ptr<std::set<KeyboardCode>> allowed_keys) {
|
| + DCHECK(HasKeyboard());
|
| + delegate_->SetAllowedKeys(allowed_keys.Pass());
|
| +}
|
| +
|
| +void EventReaderLibevdevCros::AllowAllKeys() {
|
| + DCHECK(HasKeyboard());
|
| + delegate_->AllowAllKeys();
|
| +}
|
| +
|
| bool EventReaderLibevdevCros::HasKeyboard() const {
|
| return has_keyboard_;
|
| }
|
|
|
| +bool EventReaderLibevdevCros::HasTouchpad() const {
|
| + return has_touchpad_;
|
| +}
|
| +
|
| // static
|
| void EventReaderLibevdevCros::OnSynReport(void* data,
|
| EventStateRec* evstate,
|
| struct timeval* tv) {
|
| EventReaderLibevdevCros* reader = static_cast<EventReaderLibevdevCros*>(data);
|
| + if (reader->ignore_events_)
|
| + return;
|
| +
|
| reader->delegate_->OnLibEvdevCrosEvent(&reader->evdev_, evstate, *tv);
|
| }
|
|
|
|
|