2018-04-19 17:44:42 +02:00
|
|
|
diff --git ui/base/ime/input_method_win_base.cc ui/base/ime/input_method_win_base.cc
|
2018-06-19 00:08:20 +02:00
|
|
|
index db76ef3d5f87..816473414034 100644
|
2018-04-19 17:44:42 +02:00
|
|
|
--- ui/base/ime/input_method_win_base.cc
|
|
|
|
+++ ui/base/ime/input_method_win_base.cc
|
2018-05-21 14:54:08 +02:00
|
|
|
@@ -72,8 +72,9 @@ bool InputMethodWinBase::IsWindowFocused(const TextInputClient* client) const {
|
2015-04-24 17:33:27 +02:00
|
|
|
// receiving keyboard input as long as it is an active window. This works well
|
|
|
|
// even when the |attached_window_handle| becomes active but has not received
|
|
|
|
// WM_FOCUS yet.
|
2015-06-06 00:06:48 +02:00
|
|
|
+ // With CEF |toplevel_window_handle_| may be a child window.
|
|
|
|
return toplevel_window_handle_ &&
|
2018-04-19 17:44:42 +02:00
|
|
|
- GetActiveWindow() == toplevel_window_handle_;
|
|
|
|
+ GetActiveWindow() == ::GetAncestor(toplevel_window_handle_, GA_ROOT);
|
2015-04-24 17:33:27 +02:00
|
|
|
}
|
2015-04-24 13:11:32 +02:00
|
|
|
|
2018-04-19 17:44:42 +02:00
|
|
|
LRESULT InputMethodWinBase::OnChar(HWND window_handle,
|