Ozone X11 platform

ui/events/BUILD.gn

Index: ui/events/BUILD.gn
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index 44398a6e1fc803082bcf0147432440dbc45d4d21..c3f049c50bc18e0bb89201517de4e7002cef66ea 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -55,7 +55,7 @@ component("events_base") {
     "//ui/gfx/geometry",
   ]
 
-  if (use_x11) {
+  if (use_x11_backend) {
     configs += [ "//build/config/linux:x11" ]
 
     sources += [
@@ -113,7 +113,7 @@ component("events") {
     "//ui/gfx/geometry",
   ]
 
-  if (use_x11) {
+  if (use_x11_backend) {
     sources += [ "x/events_x.cc" ]
     configs += [
       "//build/config/linux:glib",
@@ -135,6 +135,11 @@ component("events") {
   }
 
   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",
     ]
@@ -152,7 +157,7 @@ component("events") {
     ]
   }
 
-  if (is_win || is_mac || use_x11 || use_ozone) {
+  if (is_win || is_mac || use_x11_backend || use_ozone) {
     sources -= [ "events_stub.cc" ]
   }
 }
@@ -257,7 +262,7 @@ source_set("test_support") {
     ]
   }
 
-  if (use_x11) {
+  if (use_x11_backend) {
     sources += [
       "test/events_test_utils_x11.cc",
       "test/events_test_utils_x11.h",
@@ -308,7 +313,7 @@ test("events_unittests") {
     "//ui/gfx:test_support",
   ]
 
-  if (use_x11) {
+  if (use_x11_backend) {
     configs += [ "//build/config/linux:x11" ]
     deps += [ "//ui/gfx/x" ]
   } else {