Remove X11 deps from //ui/events:events_base.

ui/events/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//ui/ozone/ozone.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
@@ skipping 53 matching lines @@
   ]
 
   public_deps = [
     ":dom_keycode_converter",
     "//base",
     "//ui/events/platform",
     "//ui/gfx",
     "//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) {
     deps += [ "//ipc:param_traits" ]
   }
 }
 
 component("events") {
   sources = [
     "cocoa/cocoa_event_utils.h",
@@ skipping 48 matching lines @@
 
   if (use_x11) {
     sources += [ "x/events_x.cc" ]
     configs += [
       "//build/config/linux:glib",
       "//build/config/linux:x11",
     ]
     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",
       "linux/text_edit_command_auralinux.h",
       "linux/text_edit_key_bindings_delegate_auralinux.cc",
       "linux/text_edit_key_bindings_delegate_auralinux.h",
     ]
   }
 
   if (use_ozone || (is_android && use_aura)) {
@@ skipping 290 matching lines @@
   generate_jar_jni("motionevent_jni_headers") {
     jni_package = "ui"
     classes = [ "android/view/MotionEvent.class" ]
   }
 
   generate_jar_jni("keyevent_jni_headers") {
     jni_package = "ui"
     classes = [ "android/view/KeyEvent.class" ]
   }
 }