blob: b1b596244d23b5d6d11fbb0220c0ce814ae2c331 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
--- content/shell/browser/shell_browser_main_parts.cc.orig 2015-04-14 18:18:54.000000000 -0400
+++ content/shell/browser/shell_browser_main_parts.cc 2015-04-28 09:14:47.212411000 -0400
@@ -38,7 +38,7 @@
#if defined(USE_AURA) && defined(USE_X11)
#include "ui/events/devices/x11/touch_factory_x11.h"
#endif
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
#include "ui/base/ime/input_method_initializer.h"
#endif
@@ -105,7 +105,7 @@
}
void ShellBrowserMainParts::PreEarlyInitialization() {
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
ui::InitializeInputMethodForTesting();
#endif
#if defined(OS_ANDROID)
|
