ui/events/platform/x11/x11_events_platform.gyp - Issue 1602173005: Add PlatformWindow/Event related code for Ozone X11.

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/platform/x11/x11_events_platform.gyp

Issue 1602173005: Add PlatformWindow/Event related code for Ozone X11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixes for comments. Created 4 years, 10 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/platform/x11/x11_event_source_libevent.cc ('K') | « ui/events/platform/x11/x11_event_source_libevent.cc ('k') | ui/events/x/BUILD.gn » ('j') | ui/platform_window/x11/x11_window.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/events/platform/x11/x11_events_platform.gyp

diff --git a/ui/events/platform/x11/x11_events_platform.gyp b/ui/events/platform/x11/x11_events_platform.gyp

index cb1bbcd39c04d5806fd82a91be4da2ca0fb60576..a62472227afae3b777b02768820e40c2695b6158 100644

--- a/ui/events/platform/x11/x11_events_platform.gyp

+++ b/ui/events/platform/x11/x11_events_platform.gyp

@@ -20,13 +20,12 @@

'../../devices/events_devices.gyp:events_devices',

'../../events.gyp:events',

'../../events.gyp:events_base',

+ '../../x/events_x.gyp:events_x',

'../events_platform.gyp:events_platform',

'sources': [

'x11_event_source.cc',

'x11_event_source.h',

- 'x11_event_source_glib.cc',

- 'x11_event_source_libevent.cc',

'x11_hotplug_event_handler.cc',

'x11_hotplug_event_handler.h',

@@ -35,13 +34,15 @@

'dependencies': [

'../../../../build/linux/system.gyp:glib',

- 'sources!': [

- 'x11_event_source_libevent.cc',

+ 'sources': [

+ 'x11_event_source_glib.cc',

+ 'x11_event_source_glib.h',

}, {

# use_glib == 0

- 'sources!': [

- 'x11_event_source_glib.cc',

+ 'sources': [

+ 'x11_event_source_libevent.cc',

+ 'x11_event_source_libevent.h',

}],