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

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

Issue 2408803002: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 (Closed)
Patch Set: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 Created 4 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
« chrome/chrome_paks.gni ('K') | « chrome/chrome_repack_locales.gni ('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 f0ed9e28545ca33cff7a2ca5b6043c73c3fbf9e5..29ab185d1ba5b20176ad2abbc10ac6415fb775d0 100644
--- a/ui/base/ime/input_method_factory.cc
+++ b/ui/base/ime/input_method_factory.cc
@@ -14,7 +14,8 @@
#include "ui/base/ime/input_method_win.h"
#elif defined(OS_MACOSX)
#include "ui/base/ime/input_method_mac.h"
-#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11)
+#elif defined(USE_AURA) && defined(OS_LINUX) && \
+ (defined(USE_X11) || defined(USE_OZONE))
#include "ui/base/ime/input_method_auralinux.h"
#elif defined(OS_ANDROID)
#include "ui/base/ime/input_method_android.h"
@@ -55,7 +56,8 @@ std::unique_ptr<InputMethod> CreateInputMethod(
return base::MakeUnique<InputMethodWin>(delegate, widget);
#elif defined(OS_MACOSX)
return base::MakeUnique<InputMethodMac>(delegate);
-#elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11)
+#elif defined(USE_AURA) && defined(OS_LINUX) && \
+ (defined(USE_X11) || defined(USE_OZONE))
return base::MakeUnique<InputMethodAuraLinux>(delegate);
#elif defined(OS_ANDROID)
return base::MakeUnique<InputMethodAndroid>(delegate);
« chrome/chrome_paks.gni ('K') | « chrome/chrome_repack_locales.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698