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

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

Issue 80263005: Use RemoteInputMethodWin in production (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « no previous file | ui/base/ime/remote_input_method_win.h » ('j') | 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 6b0bd72b4d3a861228e7a69198c8f7ecd21a4333..e44c8d99e932ef5e25c536f47d27d52114c0dc5c 100644
--- a/ui/base/ime/input_method_factory.cc
+++ b/ui/base/ime/input_method_factory.cc
@@ -13,6 +13,7 @@
#include "base/win/metro.h"
#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)
#include "ui/base/ime/input_method_linux_x11.h"
#else
@@ -26,14 +27,15 @@ bool g_input_method_set_for_testing = false;
InputMethod* g_shared_input_method = NULL;
#if defined(OS_WIN)
-// Returns a new instance of input method object for IMM32 or TSF.
+// Returns a new instance of input method object for Windows.
scoped_ptr<InputMethod> CreateInputMethodWinInternal(
internal::InputMethodDelegate* delegate,
gfx::AcceleratedWidget widget) {
if (base::win::IsTSFAwareRequired())
return scoped_ptr<InputMethod>(new InputMethodTSF(delegate, widget));
- else
- return scoped_ptr<InputMethod>(new InputMethodIMM32(delegate, widget));
+ if (IsRemoteInputMethodWinRequired(widget))
+ return CreateRemoteInputMethodWin(delegate);
+ return scoped_ptr<InputMethod>(new InputMethodIMM32(delegate, widget));
}
#endif
« no previous file with comments | « no previous file | ui/base/ime/remote_input_method_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698