summaryrefslogtreecommitdiffstats
path: root/ui/base/ime/input_method_factory.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ui/base/ime/input_method_factory.cc')
-rw-r--r--ui/base/ime/input_method_factory.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/base/ime/input_method_factory.cc b/ui/base/ime/input_method_factory.cc
index b4aa3cd..12e38ea 100644
--- a/ui/base/ime/input_method_factory.cc
+++ b/ui/base/ime/input_method_factory.cc
@@ -17,6 +17,8 @@
#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
!defined(OS_CHROMEOS)
#include "ui/base/ime/input_method_auralinux.h"
+#elif defined(OS_ANDROID)
+#include "ui/base/ime/input_method_android.h"
#else
#include "ui/base/ime/input_method_minimal.h"
#endif
@@ -59,6 +61,8 @@ scoped_ptr<InputMethod> CreateInputMethod(
#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
!defined(OS_CHROMEOS)
return make_scoped_ptr(new InputMethodAuraLinux(delegate));
+#elif defined(OS_ANDROID)
+ return make_scoped_ptr(new InputMethodAndroid(delegate));
#else
return make_scoped_ptr(new InputMethodMinimal(delegate));
#endif