blob: 2afd67b9bb21d271df270834ed4e4b17814a75cf (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- ui/base/ime/input_method_initializer.cc.orig 2018-06-13 00:11:09.000000000 +0200
+++ ui/base/ime/input_method_initializer.cc 2018-07-19 21:52:04.744818000 +0200
@@ -8,7 +8,7 @@
#if defined(OS_CHROMEOS)
#include "ui/base/ime/ime_bridge.h"
-#elif defined(USE_AURA) && defined(OS_LINUX)
+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
#include "base/logging.h"
#include "ui/base/ime/linux/fake_input_method_context_factory.h"
#elif defined(OS_WIN)
@@ -18,7 +18,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
@@ -46,7 +46,7 @@
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();
@@ -67,7 +67,7 @@
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)
|
