| Index: ui/events/ozone/evdev/key_event_converter.h
|
| diff --git a/ui/events/ozone/evdev/key_event_converter.h b/ui/events/ozone/evdev/key_event_converter.h
|
| index 2a7dd6336226cd0015cdac7b327167c69f9da2b9..ebb75540e6b7daec1869c97a0fadd1282fdfaca6 100644
|
| --- a/ui/events/ozone/evdev/key_event_converter.h
|
| +++ b/ui/events/ozone/evdev/key_event_converter.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/files/file_path.h"
|
| #include "ui/events/event.h"
|
| #include "ui/events/events_export.h"
|
| +#include "ui/events/ozone/evdev/event_converter.h"
|
| #include "ui/events/ozone/evdev/event_modifiers.h"
|
| #include "ui/events/ozone/event_converter_ozone.h"
|
|
|
| @@ -15,29 +16,17 @@ struct input_event;
|
|
|
| namespace ui {
|
|
|
| -class EVENTS_EXPORT KeyEventConverterEvdev : public EventConverterOzone {
|
| +class EVENTS_EXPORT KeyEventConverterEvdev : public EventConverterEvdev {
|
| public:
|
| KeyEventConverterEvdev(int fd,
|
| base::FilePath path,
|
| EventModifiersEvdev* modifiers);
|
| virtual ~KeyEventConverterEvdev();
|
|
|
| - // Overidden from base::MessagePumpLibevent::Watcher.
|
| - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
|
| - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
|
| -
|
| - void ProcessEvents(const struct input_event* inputs, int count);
|
| + protected:
|
| + void ProcessEvents(const struct input_event* inputs, int count) OVERRIDE;
|
|
|
| private:
|
| - // File descriptor for the /dev/input/event* instance.
|
| - int fd_;
|
| -
|
| - // Path to input device.
|
| - base::FilePath path_;
|
| -
|
| - // Shared modifier state.
|
| - EventModifiersEvdev* modifiers_;
|
| -
|
| void ConvertKeyEvent(int key, int value);
|
|
|
| DISALLOW_COPY_AND_ASSIGN(KeyEventConverterEvdev);
|
|
|