ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h - Issue 2657533008: Merge "Fix double-close in EventConverterEvdevImpl"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2657533008: Merge "Fix double-close in EventConverterEvdevImpl" (Closed)

Patch Set: Created 3 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/input_device_factory_evdev.cc ('k') | ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h

diff --git a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h

index ba55e85d4424e0751d0ddf247ae7286f7af01e65..b448015221f344531c8de738069be5b41206063c 100644

--- a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h

+++ b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h

@@ -14,6 +14,7 @@

#include "base/message_loop/message_loop.h"

#include "ui/events/ozone/evdev/event_converter_evdev.h"

#include "ui/events/ozone/evdev/event_device_info.h"

+#include "ui/events/ozone/evdev/scoped_input_device.h"

namespace ui {

@@ -42,7 +43,7 @@ class EventReaderLibevdevCros : public EventConverterEvdev {

virtual void OnLibEvdevCrosStopped(Evdev* evdev, EventStateRec* state) = 0;

};

- EventReaderLibevdevCros(int fd,

+ EventReaderLibevdevCros(ScopedInputDevice fd,

const base::FilePath& path,

int id,

const EventDeviceInfo& devinfo,