Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: ui/ozone/platform/wayland/wayland_connection.h

Issue 2639053002: [ozone/wayland] Implement basic keyboard handling support (Closed)
Patch Set: Addressed spang's feedback Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/wayland/wayland_connection.h
diff --git a/ui/ozone/platform/wayland/wayland_connection.h b/ui/ozone/platform/wayland/wayland_connection.h
index 8f837b586e4b993b7d3a5bdf31a6eca19a2c26ed..c74fd504808cc40a9920726345324d01d4e3de06 100644
--- a/ui/ozone/platform/wayland/wayland_connection.h
+++ b/ui/ozone/platform/wayland/wayland_connection.h
@@ -8,12 +8,18 @@
#include <map>
#include "base/message_loop/message_pump_libevent.h"
+#include "ui/base/ui_features.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_output.h"
#include "ui/ozone/platform/wayland/wayland_pointer.h"
+#if BUILDFLAG(USE_XKBCOMMON)
+#include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"
+#endif
+
namespace ui {
class WaylandWindow;
@@ -78,6 +84,7 @@ class WaylandConnection : public PlatformEventSource,
wl::Object<xdg_shell> shell_;
std::unique_ptr<WaylandPointer> pointer_;
+ std::unique_ptr<WaylandKeyboard> keyboard_;
bool scheduled_flush_ = false;
bool watching_ = false;
@@ -85,6 +92,10 @@ class WaylandConnection : public PlatformEventSource,
std::vector<std::unique_ptr<WaylandOutput>> output_list_;
+#if BUILDFLAG(USE_XKBCOMMON)
+ XkbEvdevCodes codes_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(WaylandConnection);
};

Powered by Google App Engine
This is Rietveld 408576698