Index: ui/base/ime/input_method_factory.cc |
diff --git a/ui/base/ime/input_method_factory.cc b/ui/base/ime/input_method_factory.cc |
index 11dfb7efab46fffcdfc8715d2e35697f388e37d3..73904f24fbe726452b58d287520d521fdded6080 100644 |
--- a/ui/base/ime/input_method_factory.cc |
+++ b/ui/base/ime/input_method_factory.cc |
@@ -14,7 +14,7 @@ |
#include "ui/base/ime/input_method_imm32.h" |
#include "ui/base/ime/input_method_tsf.h" |
#include "ui/base/ime/remote_input_method_win.h" |
-#elif defined(USE_AURA) && defined(USE_X11) |
+#elif defined(USE_AURA) |
Yuki
2013/12/11 09:31:14
Better to be defined(USE_AURA) && defined(OS_LINUX
|
#include "ui/base/ime/input_method_auralinux.h" |
#else |
#include "ui/base/ime/input_method_minimal.h" |
@@ -63,7 +63,7 @@ scoped_ptr<InputMethod> DefaultInputMethodFactory::CreateInputMethod( |
if (IsRemoteInputMethodWinRequired(widget)) |
return CreateRemoteInputMethodWin(delegate); |
return scoped_ptr<InputMethod>(new InputMethodIMM32(delegate, widget)); |
-#elif defined(USE_AURA) && defined(USE_X11) |
+#elif defined(USE_AURA) |
Yuki
2013/12/11 09:31:14
Ditto.
|
return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate)); |
#else |
return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate)); |