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

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

Issue 616633002: [Ozone-Evdev] Propagate touchscreen device information to DeviceDataManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 3 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
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 f2a162da18c3743ad6898aba23695f0aaac387d0..7502bd865f389a671c352759e261be348665a925 100644
--- a/ui/events/ozone/evdev/event_converter_evdev.h
+++ b/ui/events/ozone/evdev/event_converter_evdev.h
@@ -7,21 +7,27 @@
#include "base/callback.h"
#include "base/files/file_path.h"
+#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
namespace ui {
class Event;
+class EventDeviceInfo;
typedef base::Callback<void(Event*)> EventDispatchCallback;
class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdev
: public base::MessagePumpLibevent::Watcher {
public:
- EventConverterEvdev(int fd, const base::FilePath& path);
+ EventConverterEvdev(int fd,
+ const base::FilePath& path,
+ scoped_ptr<EventDeviceInfo> device_info);
virtual ~EventConverterEvdev();
+ EventDeviceInfo* device_info() const { return device_info_.get(); }
+
// Start reading events.
void Start();
@@ -38,6 +44,8 @@ class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdev
// Path to input device.
base::FilePath path_;
+ scoped_ptr<EventDeviceInfo> device_info_;
+
// Controller for watching the input fd.
base::MessagePumpLibevent::FileDescriptorWatcher controller_;
« no previous file with comments | « no previous file | ui/events/ozone/evdev/event_converter_evdev.cc » ('j') | ui/events/ozone/evdev/event_converter_evdev.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698