| 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 b4aa3cd9e4a3dc618d98f48bf6ebb225c25e06ba..f835405f597f91518b8fd521002f513055b7cc73 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(USE_AURA) && defined(OS_ANDROID)
|
| +#include "ui/base/ime/input_method_auraandroid.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(USE_AURA) && defined(OS_ANDROID)
|
| + return make_scoped_ptr(new InputMethodAuraAndroid(delegate));
|
| #else
|
| return make_scoped_ptr(new InputMethodMinimal(delegate));
|
| #endif
|
|
|