Remove xkbcommon support.
(This further reduces our use of pkg_config() in build files.)
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1528443003 .
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index e099454..3fb3a86 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -4,7 +4,6 @@
import("//build/config/ui.gni")
import("//testing/test.gni")
-import("//ui/events/xkb.gni")
static_library("dom_keycode_converter") {
sources = [
@@ -72,7 +71,7 @@
deps += [ "//ui/gfx/x" ]
}
- if (use_x11 || use_xkbcommon) {
+ if (use_x11) {
sources += [
"keycodes/keyboard_code_conversion_xkb.cc",
"keycodes/keyboard_code_conversion_xkb.h",
@@ -315,7 +314,7 @@
"ozone/evdev/touch_event_converter_evdev_unittest.cc",
"ozone/evdev/touch_noise/touch_noise_finder_unittest.cc",
]
- if (use_x11 || use_xkbcommon) {
+ if (use_x11) {
sources += [ "ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc" ]
}
deps += [
diff --git a/ui/events/ozone/BUILD.gn b/ui/events/ozone/BUILD.gn
index 7ee8ce4..9f2d016 100644
--- a/ui/events/ozone/BUILD.gn
+++ b/ui/events/ozone/BUILD.gn
@@ -3,15 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
-import("//build/config/linux/pkg_config.gni")
import("//build/config/ui.gni")
-import("//ui/events/xkb.gni")
-
-if (use_xkbcommon) {
- pkg_config("xkbcommon") {
- packages = [ "xkbcommon" ]
- }
-}
component("events_ozone") {
sources = [
@@ -124,12 +116,6 @@
public_configs = [ ":evdev" ]
}
-config("events_ozone_layout_config") {
- if (use_xkbcommon) {
- defines = [ "USE_XKBCOMMON" ]
- }
-}
-
component("events_ozone_layout") {
sources = [
"layout/events_ozone_layout_export.h",
@@ -152,6 +138,4 @@
"//ui/events:events_base",
"//ui/ozone:ozone_base",
]
-
- public_configs = [ ":events_ozone_layout_config" ]
}
diff --git a/ui/events/xkb.gni b/ui/events/xkb.gni
deleted file mode 100644
index 1bd10d4..0000000
--- a/ui/events/xkb.gni
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-declare_args() {
- # Optional system libraries.
- use_xkbcommon = false
-}
diff --git a/ui/ozone/platform/drm/ozone_platform_drm.cc b/ui/ozone/platform/drm/ozone_platform_drm.cc
index 0424644..d12338f 100644
--- a/ui/ozone/platform/drm/ozone_platform_drm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_drm.cc
@@ -10,6 +10,7 @@
#include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
#include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
+#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
#include "ui/ozone/platform/drm/common/drm_util.h"
#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
#include "ui/ozone/platform/drm/gpu/drm_device.h"
@@ -30,13 +31,6 @@
#include "ui/ozone/public/ozone_gpu_test_helper.h"
#include "ui/ozone/public/ozone_platform.h"
-#if defined(USE_XKBCOMMON)
-#include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"
-#include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
-#else
-#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
-#endif
-
namespace ui {
namespace {
@@ -95,13 +89,8 @@
scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator())));
window_manager_.reset(new DrmWindowHostManager());
cursor_.reset(new DrmCursor(window_manager_.get()));
-#if defined(USE_XKBCOMMON)
- KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(
- new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_)));
-#else
KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
make_scoped_ptr(new StubKeyboardLayoutEngine()));
-#endif
event_factory_ozone_.reset(new EventFactoryEvdev(
cursor_.get(), device_manager_.get(),
KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()));
@@ -141,10 +130,6 @@
scoped_ptr<DrmGpuPlatformSupportHost> gpu_platform_support_host_;
scoped_ptr<DrmDisplayHostManager> display_manager_;
-#if defined(USE_XKBCOMMON)
- XkbEvdevCodes xkb_evdev_code_converter_;
-#endif
-
// Objects on both processes.
scoped_ptr<DrmSurfaceFactory> surface_factory_ozone_;
diff --git a/ui/ozone/platform/drm/ozone_platform_gbm.cc b/ui/ozone/platform/drm/ozone_platform_gbm.cc
index 12de883..3943bb7 100644
--- a/ui/ozone/platform/drm/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_gbm.cc
@@ -15,6 +15,7 @@
#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"
+#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
#include "ui/ozone/platform/drm/common/drm_util.h"
#include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
@@ -41,13 +42,6 @@
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/ozone_switches.h"
-#if defined(USE_XKBCOMMON)
-#include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"
-#include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
-#else
-#include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
-#endif
-
namespace ui {
namespace {
@@ -161,13 +155,8 @@
device_manager_ = CreateDeviceManager();
window_manager_.reset(new DrmWindowHostManager());
cursor_.reset(new DrmCursor(window_manager_.get()));
-#if defined(USE_XKBCOMMON)
- KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(
- new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_)));
-#else
KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
make_scoped_ptr(new StubKeyboardLayoutEngine()));
-#endif
event_factory_ozone_.reset(new EventFactoryEvdev(
cursor_.get(), device_manager_.get(),
KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()));
@@ -222,10 +211,6 @@
scoped_ptr<DrmDisplayHostManager> display_manager_;
scoped_ptr<DrmOverlayManager> overlay_manager_;
-#if defined(USE_XKBCOMMON)
- XkbEvdevCodes xkb_evdev_code_converter_;
-#endif
-
DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm);
};
