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

Unified Diff: ui/ozone/platform/wayland/ozone_platform_wayland.cc

Issue 2639053002: [ozone/wayland] Implement basic keyboard handling support (Closed)
Patch Set: addressed kpschoedel's review 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
« no previous file with comments | « ui/ozone/platform/wayland/fake_server.cc ('k') | ui/ozone/platform/wayland/wayland_connection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/wayland/ozone_platform_wayland.cc
diff --git a/ui/ozone/platform/wayland/ozone_platform_wayland.cc b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
index d297803c69258255157983adf728ce9de545ec00..0e3e4235657fa69e166d11bf265a2ef9be8b7231 100644
--- a/ui/ozone/platform/wayland/ozone_platform_wayland.cc
+++ b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
@@ -5,7 +5,9 @@
#include "ui/ozone/platform/wayland/ozone_platform_wayland.h"
#include "base/memory/ptr_util.h"
+#include "ui/base/ui_features.h"
#include "ui/display/fake_display_delegate.h"
+#include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
#include "ui/ozone/common/stub_overlay_manager.h"
#include "ui/ozone/platform/wayland/wayland_connection.h"
#include "ui/ozone/platform/wayland/wayland_surface_factory.h"
@@ -16,6 +18,13 @@
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/system_input_injector.h"
+#if BUILDFLAG(USE_XKBCOMMON)
+#include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"
+#include "ui/ozone/platform/wayland/wayland_xkb_keyboard_layout_engine.h"
+#else
+#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
+#endif
+
namespace ui {
namespace {
@@ -75,6 +84,15 @@ class OzonePlatformWayland : public OzonePlatform {
if (!connection_->Initialize())
LOG(FATAL) << "Failed to initialize Wayland platform";
+#if BUILDFLAG(USE_XKBCOMMON)
+ KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
+ base::MakeUnique<WaylandXkbKeyboardLayoutEngine>(
+ xkb_evdev_code_converter_));
+#else
+ KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
+ base::MakeUnique<StubKeyboardLayoutEngine>());
+#endif
+
cursor_factory_.reset(new CursorFactoryOzone);
overlay_manager_.reset(new StubOverlayManager);
input_controller_ = CreateStubInputController();
@@ -111,6 +129,10 @@ class OzonePlatformWayland : public OzonePlatform {
std::unique_ptr<InputController> input_controller_;
std::unique_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
+#if BUILDFLAG(USE_XKBCOMMON)
+ XkbEvdevCodes xkb_evdev_code_converter_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(OzonePlatformWayland);
};
« no previous file with comments | « ui/ozone/platform/wayland/fake_server.cc ('k') | ui/ozone/platform/wayland/wayland_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698