Ozone X11 platform

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")
 
 static_library("dom4_keycode_converter") {
   sources = [
     "keycodes/dom4/keycode_converter.cc",
     "keycodes/dom4/keycode_converter.h",
@@ skipping 37 matching lines @@
     "//skia",
   ]
 
   public_deps = [
     "//base",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
-  if (use_x11) {
+  if (use_x11_backend) {
     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" ]
@@ skipping 37 matching lines @@
   ]
   deps = [
     ":dom4_keycode_converter",
     ":gesture_detection",
     "//base/third_party/dynamic_annotations",
     "//skia",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
-  if (use_x11) {
+  if (use_x11_backend) {
     sources += [ "x/events_x.cc" ]
     configs += [
       "//build/config/linux:glib",
       "//build/config/linux:x11",
     ]
     deps += [
       "//ui/events/devices",
       "//ui/gfx/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) {
+    if (use_ozone_x11) {
+      defines += [
+        "OZONE_X11"

[spang, 2014/11/24 18:56:54]

can we do without this ifdef?

[achaulk, 2014/11/24 19:28:39]

Not easily, events_ozone.cc and events_x.cc both define the global void
UpdateDeviceList() and we need the X version

+      ]
+    }
     sources += [
       "ozone/events_ozone.cc",
     ]
   }
 
   if (use_aura) {
     sources += [
       "gestures/gesture_provider_aura.cc",
       "gestures/gesture_provider_aura.h",
       "gestures/motion_event_aura.cc",
       "gestures/motion_event_aura.h",
       "gestures/gesture_recognizer.h",
       "gestures/gesture_recognizer_impl.cc",
       "gestures/gesture_recognizer_impl.h",
     ]
   }
 
-  if (is_win || is_mac || use_x11 || use_ozone) {
+  if (is_win || is_mac || use_x11_backend || use_ozone) {
     sources -= [ "events_stub.cc" ]
   }
 }
 
 component("gesture_detection") {
   sources = [
     "gesture_detection/bitset_32.h",
     "gesture_detection/filtered_gesture_provider.cc",
     "gesture_detection/filtered_gesture_provider.h",
     "gesture_detection/gesture_configuration.cc",
@@ skipping 84 matching lines @@
     "//ui/gfx/geometry",
   ]
 
   if (is_ios) {
     sources -= [
       "test/cocoa_test_event_utils.h",
       "test/cocoa_test_event_utils.mm",
     ]
   }
 
-  if (use_x11) {
+  if (use_x11_backend) {
     sources += [
       "test/events_test_utils_x11.cc",
       "test/events_test_utils_x11.h",
     ]
     deps += [
       "//ui/events/devices",
       "//ui/gfx/x",
     ]
   }
 }
@@ skipping 30 matching lines @@
     ":test_support",
     "//base",
     "//base/test:run_all_unittests",
     "//skia",
     "//testing/gtest",
     "//ui/events/devices",
     "//ui/events/platform",
     "//ui/gfx:test_support",
   ]
 
-  if (use_x11) {
+  if (use_x11_backend) {
     configs += [ "//build/config/linux:x11" ]
     deps += [ "//ui/gfx/x" ]
   } else {
     sources -= [
       "devices/x11/device_data_manager_x11_unittest.cc",
       "x/events_x_unittest.cc",
     ]
   }
 
   if (use_ozone) {
     sources += [
       "ozone/evdev/event_converter_evdev_impl_unittest.cc",
       "ozone/evdev/tablet_event_converter_evdev_unittest.cc",
       "ozone/evdev/touch_event_converter_evdev_unittest.cc",
     ]
     deps += [
       "//ui/events/ozone:events_ozone",
       "//ui/events/ozone:events_ozone_evdev",
     ]
   }
 
   if (use_aura) {
     sources += [
       "gestures/gesture_provider_aura_unittest.cc",
     ]
   }
 }