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

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

Issue 1602403002: Revert of Remove remote tree host and some related input and metro_driver code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-3
Patch Set: Created 4 years, 11 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
« no previous file with comments | « ui/base/ime/BUILD.gn ('k') | ui/base/ime/remote_input_method_delegate_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 1fda6daaad749c5163beaa8b0de5e1f3ba1fe0cf..dd9d31a666508fc414db94724fd25c8777ab360b 100644
--- a/ui/base/ime/input_method_factory.cc
+++ b/ui/base/ime/input_method_factory.cc
@@ -11,6 +11,7 @@
#include "ui/base/ime/input_method_chromeos.h"
#elif defined(OS_WIN)
#include "ui/base/ime/input_method_win.h"
+#include "ui/base/ime/remote_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) && \
@@ -52,6 +53,8 @@
#if defined(OS_CHROMEOS)
return make_scoped_ptr(new InputMethodChromeOS(delegate));
#elif defined(OS_WIN)
+ if (IsRemoteInputMethodWinRequired(widget))
+ return CreateRemoteInputMethodWin(delegate);
return make_scoped_ptr(new InputMethodWin(delegate, widget));
#elif defined(OS_MACOSX)
return make_scoped_ptr(new InputMethodMac(delegate));
« no previous file with comments | « ui/base/ime/BUILD.gn ('k') | ui/base/ime/remote_input_method_delegate_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698