Index: components/exo/wayland/server.cc |
diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc |
index 7b3d47ed80040647c1ddc52cbfadf1d94d6f513a..bdccab1f28401b7d0c46562571b747a328eadc69 100644 |
--- a/components/exo/wayland/server.cc |
+++ b/components/exo/wayland/server.cc |
@@ -64,6 +64,7 @@ |
#include "third_party/skia/include/core/SkRegion.h" |
#include "ui/aura/window_property.h" |
#include "ui/base/hit_test.h" |
+#include "ui/base/ui_features.h" |
#include "ui/compositor/compositor_vsync_manager.h" |
#include "ui/display/display_observer.h" |
#include "ui/display/manager/managed_display_info.h" |
@@ -80,7 +81,7 @@ |
#include <wayland-drm-server-protocol.h> |
#endif |
-#if defined(USE_XKBCOMMON) |
+#if BUILDFLAG(USE_XKBCOMMON) |
#include <xkbcommon/xkbcommon.h> |
#include "ui/events/keycodes/scoped_xkb.h" // nogncheck |
#endif |
@@ -2172,7 +2173,7 @@ void pointer_release(wl_client* client, wl_resource* resource) { |
const struct wl_pointer_interface pointer_implementation = {pointer_set_cursor, |
pointer_release}; |
-#if defined(USE_XKBCOMMON) |
+#if BUILDFLAG(USE_XKBCOMMON) |
//////////////////////////////////////////////////////////////////////////////// |
// wl_keyboard_interface: |
@@ -2407,7 +2408,7 @@ void seat_get_pointer(wl_client* client, wl_resource* resource, uint32_t id) { |
} |
void seat_get_keyboard(wl_client* client, wl_resource* resource, uint32_t id) { |
-#if defined(USE_XKBCOMMON) |
+#if BUILDFLAG(USE_XKBCOMMON) |
uint32_t version = wl_resource_get_version(resource); |
wl_resource* keyboard_resource = |
wl_resource_create(client, &wl_keyboard_interface, version, id); |
@@ -2452,7 +2453,7 @@ void bind_seat(wl_client* client, void* data, uint32_t version, uint32_t id) { |
wl_seat_send_name(resource, "default"); |
uint32_t capabilities = WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_TOUCH; |
-#if defined(USE_XKBCOMMON) |
+#if BUILDFLAG(USE_XKBCOMMON) |
capabilities |= WL_SEAT_CAPABILITY_KEYBOARD; |
#endif |
wl_seat_send_capabilities(resource, capabilities); |