| Index: ui/ozone/platform/wayland/wayland_display.h
|
| diff --git a/ui/ozone/platform/wayland/wayland_display.h b/ui/ozone/platform/wayland/wayland_display.h
|
| index eb72c9ccf075e2be2452da465fd775317b32030f..57c93ea437f1ea8f7f4134efe4d76f205aa3127e 100644
|
| --- a/ui/ozone/platform/wayland/wayland_display.h
|
| +++ b/ui/ozone/platform/wayland/wayland_display.h
|
| @@ -10,9 +10,14 @@
|
| #include "base/message_loop/message_pump_libevent.h"
|
| #include "ui/events/platform/platform_event_source.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| +#include "ui/ozone/platform/wayland/wayland_keyboard.h"
|
| #include "ui/ozone/platform/wayland/wayland_object.h"
|
| #include "ui/ozone/platform/wayland/wayland_pointer.h"
|
|
|
| +#if defined(USE_XKBCOMMON)
|
| +#include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"
|
| +#endif
|
| +
|
| namespace ui {
|
|
|
| class WaylandWindow;
|
| @@ -74,11 +79,16 @@ class WaylandDisplay : public PlatformEventSource,
|
| wl::Object<xdg_shell> shell_;
|
|
|
| scoped_ptr<WaylandPointer> pointer_;
|
| + scoped_ptr<WaylandKeyboard> keyboard_;
|
|
|
| bool scheduled_flush_ = false;
|
| bool watching_ = false;
|
| base::MessagePumpLibevent::FileDescriptorWatcher controller_;
|
|
|
| +#if defined(USE_XKBCOMMON)
|
| + XkbEvdevCodes codes_;
|
| +#endif
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(WaylandDisplay);
|
| };
|
|
|
|
|