41 lines
1.6 KiB
C++
41 lines
1.6 KiB
C++
$NetBSD$
|
|
|
|
--- ui/base/ime/init/input_method_initializer.cc.orig 2020-07-15 18:56:33.000000000 +0000
|
|
+++ ui/base/ime/init/input_method_initializer.cc
|
|
@@ -10,7 +10,7 @@
|
|
|
|
#if defined(OS_CHROMEOS)
|
|
#include "ui/base/ime/chromeos/ime_bridge.h"
|
|
-#elif defined(USE_AURA) && defined(OS_LINUX)
|
|
+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
|
|
#include "base/check.h"
|
|
// TODO(crbug.com/1085700): Remove nogncheck when we can build both Ozone
|
|
// Wayland and X11 on Linux codesearch-gen bots.
|
|
@@ -22,7 +22,7 @@
|
|
|
|
namespace {
|
|
|
|
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
|
|
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
|
|
const ui::LinuxInputMethodContextFactory*
|
|
g_linux_input_method_context_factory_for_testing;
|
|
#endif
|
|
@@ -50,7 +50,7 @@ void ShutdownInputMethod() {
|
|
void InitializeInputMethodForTesting() {
|
|
#if defined(OS_CHROMEOS)
|
|
IMEBridge::Initialize();
|
|
-#elif defined(USE_AURA) && defined(OS_LINUX)
|
|
+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
|
|
if (!g_linux_input_method_context_factory_for_testing)
|
|
g_linux_input_method_context_factory_for_testing =
|
|
new FakeInputMethodContextFactory();
|
|
@@ -69,7 +69,7 @@ void InitializeInputMethodForTesting() {
|
|
void ShutdownInputMethodForTesting() {
|
|
#if defined(OS_CHROMEOS)
|
|
IMEBridge::Shutdown();
|
|
-#elif defined(USE_AURA) && defined(OS_LINUX)
|
|
+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
|
|
const LinuxInputMethodContextFactory* factory =
|
|
LinuxInputMethodContextFactory::instance();
|
|
CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing)
|