| Index: ui/events/ozone/evdev/event_converter.h
|
| diff --git a/ui/events/ozone/evdev/key_event_converter.h b/ui/events/ozone/evdev/event_converter.h
|
| similarity index 53%
|
| copy from ui/events/ozone/evdev/key_event_converter.h
|
| copy to ui/events/ozone/evdev/event_converter.h
|
| index 2a7dd6336226cd0015cdac7b327167c69f9da2b9..0a20ee31ac2763bab322d8be1eb62463f9ee8a2b 100644
|
| --- a/ui/events/ozone/evdev/key_event_converter.h
|
| +++ b/ui/events/ozone/evdev/event_converter.h
|
| @@ -1,9 +1,9 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_EVENTS_OZONE_EVDEV_KEY_EVENT_CONVERTER_EVDEV_H_
|
| -#define UI_EVENTS_OZONE_EVDEV_KEY_EVENT_CONVERTER_EVDEV_H_
|
| +#ifndef UI_EVENTS_OZONE_EVDEV_EVENT_CONVERTER_H_
|
| +#define UI_EVENTS_OZONE_EVDEV_EVENT_CONVERTER_H_
|
|
|
| #include "base/files/file_path.h"
|
| #include "ui/events/event.h"
|
| @@ -15,20 +15,21 @@ struct input_event;
|
|
|
| namespace ui {
|
|
|
| -class EVENTS_EXPORT KeyEventConverterEvdev : public EventConverterOzone {
|
| +class EVENTS_EXPORT EventConverterEvdev : public EventConverterOzone {
|
| public:
|
| - KeyEventConverterEvdev(int fd,
|
| - base::FilePath path,
|
| - EventModifiersEvdev* modifiers);
|
| - virtual ~KeyEventConverterEvdev();
|
| + EventConverterEvdev(int fd,
|
| + base::FilePath path,
|
| + EventModifiersEvdev* modifiers);
|
| + virtual ~EventConverterEvdev();
|
|
|
| // 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:
|
| + // Process & dispatch events read from the device.
|
| + virtual void ProcessEvents(const struct input_event* inputs, int count) = 0;
|
|
|
| - private:
|
| // File descriptor for the /dev/input/event* instance.
|
| int fd_;
|
|
|
| @@ -38,12 +39,10 @@ class EVENTS_EXPORT KeyEventConverterEvdev : public EventConverterOzone {
|
| // Shared modifier state.
|
| EventModifiersEvdev* modifiers_;
|
|
|
| - void ConvertKeyEvent(int key, int value);
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(KeyEventConverterEvdev);
|
| + private:
|
| + DISALLOW_COPY_AND_ASSIGN(EventConverterEvdev);
|
| };
|
|
|
| } // namspace ui
|
|
|
| -#endif // UI_EVENTS_OZONE_EVDEV_KEY_EVENT_CONVERTER_EVDEV_H_
|
| -
|
| +#endif // UI_EVENTS_OZONE_EVDEV_EVENT_CONVERTER_H_
|
|
|