| Index: ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h
|
| diff --git a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h
|
| index 1631c5b685bdca6c558e02a7867572f05d419698..11ff8e964f306f03957e9618045cca47c7794e81 100644
|
| --- a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h
|
| +++ b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h
|
| @@ -20,8 +20,7 @@ namespace ui {
|
| //
|
| // The library doesn't support all devices currently. In particular there
|
| // is no support for keyboard events.
|
| -class EventReaderLibevdevCros : public base::MessagePumpLibevent::Watcher,
|
| - public EventConverterEvdev {
|
| +class EventReaderLibevdevCros : public EventConverterEvdev {
|
| public:
|
| class Delegate {
|
| public:
|
| @@ -41,13 +40,8 @@ class EventReaderLibevdevCros : public base::MessagePumpLibevent::Watcher,
|
| scoped_ptr<Delegate> delegate);
|
| ~EventReaderLibevdevCros();
|
|
|
| - // Overridden from ui::EventDeviceEvdev.
|
| - void Start() OVERRIDE;
|
| - void Stop() OVERRIDE;
|
| -
|
| - // Overidden from MessagePumpLibevent::Watcher.
|
| + // EventConverterEvdev:
|
| virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
|
| - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
|
|
|
| private:
|
| static void OnSynReport(void* data,
|
| @@ -67,9 +61,6 @@ class EventReaderLibevdevCros : public base::MessagePumpLibevent::Watcher,
|
| // Delegate for event processing.
|
| scoped_ptr<Delegate> delegate_;
|
|
|
| - // Controller for watching the input fd.
|
| - base::MessagePumpLibevent::FileDescriptorWatcher controller_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(EventReaderLibevdevCros);
|
| };
|
|
|
|
|