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

Unified Diff: ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc

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/libgestures_glue/event_reader_libevdev_cros.cc
diff --git a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
index eeb49f3aa03a47d8d59c493eae0cad3c11a964bb..ea3200c7ec68de6950abde91fa4b72b7105beb0b 100644
--- a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
+++ b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
@@ -11,6 +11,7 @@
#include "base/message_loop/message_loop.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
+#include "ui/events/ozone/evdev/event_device_info.h"
namespace ui {
@@ -25,10 +26,13 @@ std::string FormatLog(const char* fmt, va_list args) {
} // namespace
-EventReaderLibevdevCros::EventReaderLibevdevCros(int fd,
- const base::FilePath& path,
- scoped_ptr<Delegate> delegate)
- : EventConverterEvdev(fd, path), delegate_(delegate.Pass()) {
+EventReaderLibevdevCros::EventReaderLibevdevCros(
+ int fd,
+ const base::FilePath& path,
+ scoped_ptr<EventDeviceInfo> device_info,
+ scoped_ptr<Delegate> delegate)
+ : EventConverterEvdev(fd, path, device_info.Pass()),
+ delegate_(delegate.Pass()) {
memset(&evdev_, 0, sizeof(evdev_));
evdev_.log = OnLogMessage;
evdev_.log_udata = this;

Powered by Google App Engine
This is Rietveld 408576698