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

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

Issue 100213003: Support for providing IMEContext with Ozone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mv InputMethodContextFactoryOzone to ozone/ime Created 7 years 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
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));

Powered by Google App Engine
This is Rietveld 408576698