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

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

Issue 1102673002: Revert of Ozone support for device special cases in keyboard event rewriting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/event.cc ('k') | ui/events/ozone/evdev/event_converter_evdev.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ea7b7bdd70878eea78b5a3df8c2dc07c0baf1994..eaa4059274ae60fbf34d93685bc559fb9003d7aa 100644
--- a/ui/events/ozone/evdev/event_converter_evdev.h
+++ b/ui/events/ozone/evdev/event_converter_evdev.h
@@ -26,19 +26,14 @@
EventConverterEvdev(int fd,
const base::FilePath& path,
int id,
- InputDeviceType type,
- const std::string& name,
- uint16_t vendor_id,
- uint16_t product_id);
+ InputDeviceType type);
~EventConverterEvdev() override;
- int id() const { return input_device_.id; }
+ int id() const { return id_; }
const base::FilePath& path() const { return path_; }
- InputDeviceType type() const { return input_device_.type; }
-
- const InputDevice& input_device() const { return input_device_; }
+ InputDeviceType type() const { return type_; }
void set_ignore_events(bool ignore_events) { ignore_events_ = ignore_events; }
@@ -96,9 +91,11 @@
// Path to input device.
base::FilePath path_;
- // Input device information, including id (which uniquely identifies an
- // event converter) and type.
- InputDevice input_device_;
+ // Uniquely identifies an event converter.
+ int id_;
+
+ // Type (internal or external).
+ InputDeviceType type_;
// Whether events from the device should be ignored.
bool ignore_events_;
« no previous file with comments | « ui/events/event.cc ('k') | ui/events/ozone/evdev/event_converter_evdev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698