Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: ui/base/ime/input_method_factory.cc

Issue 1394883004: Introduce InputMethodAuraAndroid for Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reviews Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/base/ime/input_method_android.cc ('K') | « ui/base/ime/input_method_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..12e38ea1c3ca76424b8d8b1ccc65fb448e67c1e8 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
« ui/base/ime/input_method_android.cc ('K') | « ui/base/ime/input_method_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698