Index: ui/events/BUILD.gn |
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn |
index 92df985d5064cb18d06482e571e227032a489232..42e911203282c1ac0e8cec1878dc4251e2c2418b 100644 |
--- a/ui/events/BUILD.gn |
+++ b/ui/events/BUILD.gn |
@@ -71,28 +71,8 @@ component("events_base") { |
"//ui/gfx/geometry", |
] |
- # TODO(kylechar): move keycodes/ files into own component and x/ files into |
- # ui/events/x component |
- if (use_x11 || ozone_platform_x11) { |
- configs += [ "//build/config/linux:x11" ] |
- |
- sources += [ |
- "keycodes/keyboard_code_conversion_x.cc", |
- "keycodes/keyboard_code_conversion_x.h", |
- "x/keysym_to_unicode.cc", |
- "x/keysym_to_unicode.h", |
- ] |
- |
- deps += [ "//ui/gfx/x" ] |
- } |
- |
- if (use_x11 || ozone_platform_x11 || use_xkbcommon) { |
- sources += [ |
- "keycodes/keyboard_code_conversion_xkb.cc", |
- "keycodes/keyboard_code_conversion_xkb.h", |
- "keycodes/scoped_xkb.h", |
- "keycodes/xkb_keysym.h", |
- ] |
+ if (use_x11) { |
+ public_deps += [ "//ui/events/keycodes:x" ] |
} |
if (!is_ios) { |
@@ -161,14 +141,11 @@ component("events") { |
deps += [ |
"//ui/events/devices", |
"//ui/events/devices/x11", |
+ "//ui/events/x", |
"//ui/gfx/x", |
] |
} |
- if (use_x11 || ozone_platform_x11) { |
- deps += [ "//ui/events/x" ] |
- } |
- |
if (!is_chromeos && is_linux) { |
sources += [ |
"linux/text_edit_command_auralinux.cc", |