| Index: ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| diff --git a/ui/ozone/platform/drm/ozone_platform_gbm.cc b/ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| index 31e76f51299dde8388d8748bf8258f9cc34b0437..3a30dfb0c0e4baa91d977cb282a709fb1fc4f797 100644
|
| --- a/ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| +++ b/ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| @@ -20,6 +20,7 @@
|
| #include "services/service_manager/public/cpp/interface_factory.h"
|
| #include "services/service_manager/public/cpp/interface_registry.h"
|
| #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
|
| +#include "ui/base/ui_features.h"
|
| #include "ui/events/ozone/device/device_manager.h"
|
| #include "ui/events/ozone/evdev/event_factory_evdev.h"
|
| #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
|
| @@ -47,7 +48,7 @@
|
| #include "ui/ozone/public/ozone_platform.h"
|
| #include "ui/ozone/public/ozone_switches.h"
|
|
|
| -#if defined(USE_XKBCOMMON)
|
| +#if BUILDFLAG(USE_XKBCOMMON)
|
| #include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"
|
| #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
|
| #else
|
| @@ -160,7 +161,7 @@ class OzonePlatformGbm
|
| device_manager_ = CreateDeviceManager();
|
| window_manager_.reset(new DrmWindowHostManager());
|
| cursor_.reset(new DrmCursor(window_manager_.get()));
|
| -#if defined(USE_XKBCOMMON)
|
| +#if BUILDFLAG(USE_XKBCOMMON)
|
| KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
|
| base::MakeUnique<XkbKeyboardLayoutEngine>(xkb_evdev_code_converter_));
|
| #else
|
| @@ -267,7 +268,7 @@ class OzonePlatformGbm
|
| // Bridges the DRM, GPU and main threads in mus.
|
| std::unique_ptr<MusThreadProxy> mus_thread_proxy_;
|
|
|
| -#if defined(USE_XKBCOMMON)
|
| +#if BUILDFLAG(USE_XKBCOMMON)
|
| XkbEvdevCodes xkb_evdev_code_converter_;
|
| #endif
|
|
|
|
|