Replace X11 includes in //ui/ozone with ui/gfx/x/x11.h

X11 header files are infamous for creating macros with common
names such as None, True, False, Status, Bool, ...

Use a wrapper header ui/gfx/x/x11.h to simplify our work.

Bug: 782184
Change-Id: I25a14236e6d4490a04dee49430929898d4ec124c
Reviewed-on: https://chromium-review.googlesource.com/809124Reviewed-by: kylechar <kylechar@chromium.org>
Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#521785}

ui/ozone/platform/x11/gl_surface_egl_ozone_x11.cc

@@ -4,8 +4,7 @@
 
 #include "ui/ozone/platform/x11/gl_surface_egl_ozone_x11.h"
 
-#include <X11/Xlib.h>
-
+#include "ui/gfx/x/x11.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/gl/egl_util.h"
 

ui/ozone/platform/x11/gl_surface_glx_ozone.cc

@@ -4,7 +4,7 @@
 
 #include "ui/ozone/platform/x11/gl_surface_glx_ozone.h"
 
-#include <X11/Xlib.h>
+#include "ui/gfx/x/x11.h"
 
 namespace ui {
 

ui/ozone/platform/x11/ozone_platform_x11.cc

@@ -4,8 +4,6 @@
 
 #include "ui/ozone/platform/x11/ozone_platform_x11.h"
 
-#include <X11/Xlib.h>
-
 #include <memory>
 #include <utility>
 
@@ -17,6 +15,7 @@
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #include "ui/events/platform/x11/x11_event_source_libevent.h"
 #include "ui/events/system_input_injector.h"
+#include "ui/gfx/x/x11.h"
 #include "ui/ozone/common/stub_overlay_manager.h"
 #include "ui/ozone/platform/x11/x11_cursor_factory_ozone.h"
 #include "ui/ozone/platform/x11/x11_surface_factory.h"

ui/ozone/platform/x11/x11_cursor_factory_ozone.h

@@ -5,14 +5,13 @@
 #ifndef UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_
 #define UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_
 
-#include <X11/X.h>
-
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "ui/base/cursor/cursor.h"
+#include "ui/gfx/x/x11.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
 #include "ui/platform_window/x11/x11_cursor_ozone.h"
 

ui/ozone/platform/x11/x11_surface_factory.cc

@@ -4,9 +4,8 @@
 
 #include "ui/ozone/platform/x11/x11_surface_factory.h"
 
-#include <X11/Xlib.h>
-
 #include "base/memory/ptr_util.h"
+#include "ui/gfx/x/x11.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/ozone/common/egl_util.h"