| Index: ui/events/ozone/evdev/touch_event_converter.h | 
| diff --git a/ui/events/ozone/evdev/touch_event_converter.h b/ui/events/ozone/evdev/touch_event_converter.h | 
| index 1d2817c657597adc6f4dd56b80b1f5903f447fa3..6f777e670a0f038e372a4a34b23543e9ff196b1c 100644 | 
| --- a/ui/events/ozone/evdev/touch_event_converter.h | 
| +++ b/ui/events/ozone/evdev/touch_event_converter.h | 
| @@ -11,30 +11,33 @@ | 
| #include "base/files/file_path.h" | 
| #include "ui/events/event_constants.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" | 
|  | 
| namespace ui { | 
|  | 
| class TouchEvent; | 
|  | 
| -class EVENTS_EXPORT TouchEventConverterEvdev : public EventConverterOzone { | 
| +class EVENTS_EXPORT TouchEventConverterEvdev : public EventConverterEvdev { | 
| public: | 
| enum { | 
| MAX_FINGERS = 11 | 
| }; | 
| -  TouchEventConverterEvdev(int fd, base::FilePath path); | 
| +  TouchEventConverterEvdev(int fd, | 
| +                           base::FilePath path, | 
| +                           EventModifiersEvdev* modifiers); | 
| virtual ~TouchEventConverterEvdev(); | 
|  | 
| + protected: | 
| +  void ProcessEvents(const struct input_event* inputs, int count) OVERRIDE; | 
| + | 
| private: | 
| friend class MockTouchEventConverterEvdev; | 
|  | 
| // Unsafe part of initialization. | 
| void Init(); | 
|  | 
| -  // Overidden from base::MessagePumpLibevent::Watcher. | 
| -  virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; | 
| -  virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; | 
| - | 
| // Pressure values. | 
| int pressure_min_; | 
| int pressure_max_;  // Used to normalize pressure values. | 
|  |