ui/events/ozone/evdev/key_event_converter_evdev.cc - Issue 616633002: [Ozone-Evdev] Propagate touchscreen device information to DeviceDataManager

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/key_event_converter_evdev.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

« ui/events/ozone/evdev/event_factory_evdev.cc ('K') | « ui/events/ozone/evdev/key_event_converter_evdev.h ('k') | ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/events/ozone/evdev/key_event_converter_evdev.cc

diff --git a/ui/events/ozone/evdev/key_event_converter_evdev.cc b/ui/events/ozone/evdev/key_event_converter_evdev.cc

index 3ec27617ded827c89190b899e3e336330350a156..d9b90506a58b4755f47d04f195a9d62c7890304c 100644

--- a/ui/events/ozone/evdev/key_event_converter_evdev.cc

+++ b/ui/events/ozone/evdev/key_event_converter_evdev.cc

@@ -11,6 +11,7 @@

#include "ui/events/event.h"

#include "ui/events/keycodes/dom4/keycode_converter.h"

#include "ui/events/keycodes/keyboard_codes.h"

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

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

namespace ui {

@@ -192,9 +193,10 @@ bool IsLockButton(unsigned int code) { return code == KEY_CAPSLOCK; }

KeyEventConverterEvdev::KeyEventConverterEvdev(

int fd,

base::FilePath path,

+ scoped_ptr<EventDeviceInfo> device_info,

EventModifiersEvdev* modifiers,

const EventDispatchCallback& callback)

- : EventConverterEvdev(fd, path),

+ : EventConverterEvdev(fd, path, device_info.Pass()),

callback_(callback),

modifiers_(modifiers) {

// TODO(spang): Initialize modifiers using EVIOCGKEY.