Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(441)

Unified Diff: ui/events/ozone/evdev/key_event_converter.h

Issue 137273009: evdev: Factor common code out of key & touch converters (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove duplicate variables & unneeded #include Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/ozone/evdev/event_factory.cc ('k') | ui/events/ozone/evdev/key_event_converter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « ui/events/ozone/evdev/event_factory.cc ('k') | ui/events/ozone/evdev/key_event_converter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698