blob: fa43fbbece7ea8cf77658c9150391eb802210de5 (
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
|
--- src/3rdparty/chromium/ui/base/ime/init/input_method_initializer.cc.orig 2022-09-26 10:05:50 UTC
+++ src/3rdparty/chromium/ui/base/ime/init/input_method_initializer.cc
@@ -10,7 +10,7 @@
#include "build/chromeos_buildflags.h"
#if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
#include "base/check.h"
#include "ui/base/ime/linux/fake_input_method_context_factory.h"
#elif BUILDFLAG(IS_WIN)
@@ -20,7 +20,7 @@ namespace {
namespace {
-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
const ui::LinuxInputMethodContextFactory*
g_linux_input_method_context_factory_for_testing;
#endif
@@ -43,7 +43,7 @@ void InitializeInputMethodForTesting() {
void InitializeInputMethodForTesting() {
#if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
if (!g_linux_input_method_context_factory_for_testing)
g_linux_input_method_context_factory_for_testing =
new FakeInputMethodContextFactory();
@@ -61,7 +61,7 @@ void ShutdownInputMethodForTesting() {
void ShutdownInputMethodForTesting() {
#if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
const LinuxInputMethodContextFactory* factory =
LinuxInputMethodContextFactory::instance();
CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing)
|
