| Index: ui/events/ozone/evdev/event_converter_evdev.h
|
| diff --git a/ui/events/ozone/evdev/event_converter_evdev.h b/ui/events/ozone/evdev/event_converter_evdev.h
|
| index af4f067767eecde241dc00ca9bb03320f3f3cb0a..5bb9e05325dd4999ee366eb90df287cf6784cce2 100644
|
| --- a/ui/events/ozone/evdev/event_converter_evdev.h
|
| +++ b/ui/events/ozone/evdev/event_converter_evdev.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/callback.h"
|
| #include "base/files/file_path.h"
|
| #include "base/message_loop/message_loop.h"
|
| +#include "ui/events/devices/input_device.h"
|
| #include "ui/events/ozone/evdev/event_dispatch_callback.h"
|
| #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
|
| #include "ui/gfx/geometry/size.h"
|
| @@ -17,13 +18,18 @@ namespace ui {
|
| class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdev
|
| : public base::MessagePumpLibevent::Watcher {
|
| public:
|
| - EventConverterEvdev(int fd, const base::FilePath& path, int id);
|
| + EventConverterEvdev(int fd,
|
| + const base::FilePath& path,
|
| + int id,
|
| + InputDeviceType type);
|
| ~EventConverterEvdev() override;
|
|
|
| int id() const { return id_; }
|
|
|
| const base::FilePath& path() const { return path_; }
|
|
|
| + InputDeviceType type() const { return type_; }
|
| +
|
| // Start reading events.
|
| void Start();
|
|
|
| @@ -37,9 +43,6 @@ class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdev
|
| // touchscreen device.
|
| virtual gfx::Size GetTouchscreenSize() const;
|
|
|
| - // Returns true if the converter is used with an internal device.
|
| - virtual bool IsInternal() const;
|
| -
|
| protected:
|
| // base::MessagePumpLibevent::Watcher:
|
| void OnFileCanWriteWithoutBlocking(int fd) override;
|
| @@ -53,6 +56,9 @@ class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdev
|
| // Uniquely identifies an event converter.
|
| int id_;
|
|
|
| + // Type (internal or external).
|
| + InputDeviceType type_;
|
| +
|
| // Controller for watching the input fd.
|
| base::MessagePumpLibevent::FileDescriptorWatcher controller_;
|
|
|
|
|