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

Unified Diff: ui/aura/window_targeter.cc

Issue 253233002: Merge 266651 "linux-aura: Supports Compose key with XIM." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1916/src/
Patch Set: Created 6 years, 8 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
Index: ui/aura/window_targeter.cc
===================================================================
--- ui/aura/window_targeter.cc (revision 266993)
+++ ui/aura/window_targeter.cc (working copy)
@@ -91,7 +91,8 @@
Window* WindowTargeter::FindTargetForKeyEvent(Window* window,
const ui::KeyEvent& key) {
Window* root_window = window->GetRootWindow();
- if (key.key_code() == ui::VKEY_UNKNOWN)
+ if (key.key_code() == ui::VKEY_UNKNOWN &&
+ (key.flags() & ui::EF_IME_FABRICATED_KEY) == 0)
return NULL;
client::FocusClient* focus_client = client::GetFocusClient(root_window);
Window* focused_window = focus_client->GetFocusedWindow();
« no previous file with comments | « chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc ('k') | ui/base/ime/input_method_auralinux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698