Index: ui/base/ime/remote_input_method_win.cc |
diff --git a/ui/base/ime/remote_input_method_win.cc b/ui/base/ime/remote_input_method_win.cc |
index 9fad0adbd957c5e7ef7e673202bd6cc44cd2e911..0fc1936f14e4f5e5843301cddc6d323fc501538b 100644 |
--- a/ui/base/ime/remote_input_method_win.cc |
+++ b/ui/base/ime/remote_input_method_win.cc |
@@ -4,6 +4,7 @@ |
#include "ui/base/ime/remote_input_method_win.h" |
+#include "base/command_line.h" |
#include "base/observer_list.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/win/metro.h" |
@@ -14,6 +15,7 @@ |
#include "ui/base/ime/remote_input_method_delegate_win.h" |
#include "ui/base/ime/text_input_client.h" |
#include "ui/base/ime/win/tsf_input_scope.h" |
+#include "ui/base/ui_base_switches.h" |
#include "ui/events/event.h" |
#include "ui/events/event_utils.h" |
#include "ui/gfx/rect.h" |
@@ -371,7 +373,9 @@ bool IsRemoteInputMethodWinRequired(gfx::AcceleratedWidget widget) { |
PROCESS_QUERY_LIMITED_INFORMATION, FALSE, process_id)); |
if (!process_handle.IsValid()) |
return false; |
- return base::win::IsProcessImmersive(process_handle.Get()); |
+ return base::win::IsProcessImmersive(process_handle.Get()) || |
+ CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kViewerConnect); |
} |
RemoteInputMethodPrivateWin::RemoteInputMethodPrivateWin() {} |