diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 23:42:31 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 23:42:31 +0000 |
| commit | 6b98e52b28fa37b71d4dd80556e936277a85dbc6 (patch) | |
| tree | 51ba108da81657563670b942dee4c5de315ffd5e /views/focus/accelerator_handler_touch.cc | |
| parent | 988ace29e4f1990cf22f7d9781049e0b14d3d5cd (diff) | |
| download | chromium_src-6b98e52b28fa37b71d4dd80556e936277a85dbc6.zip chromium_src-6b98e52b28fa37b71d4dd80556e936277a85dbc6.tar.gz chromium_src-6b98e52b28fa37b71d4dd80556e936277a85dbc6.tar.bz2 | |
Revert 82751 - Add NativeWidgetDelegate/Widget::OnKeyEvent post-IME handling.Refactor XEvent code and InputMethodGtk::DispatchKeyEvent.Nix WidgetWin::GetFocusedViewRootView, rename RootView::OnKeyEvent.Cleanup headers and refactor code in extension_input_api.cc.BUG=72040TEST=Key event handling in win/linux_views/touch; extension input API SendKeyboardEventInputFunction use.Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=82713Review URL: http://codereview.chromium.org/6823055
TBR=msw@chromium.org
Review URL: http://codereview.chromium.org/6897033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus/accelerator_handler_touch.cc')
| -rw-r--r-- | views/focus/accelerator_handler_touch.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc index a18bbe1..716cb29 100644 --- a/views/focus/accelerator_handler_touch.cc +++ b/views/focus/accelerator_handler_touch.cc @@ -179,7 +179,14 @@ bool DispatchXEvent(XEvent* xev) { case KeyRelease: { Event::FromNativeEvent2 from_native; KeyEvent keyev(xev, from_native); - return widget->OnKeyEvent(keyev); + InputMethod* ime = widget->GetInputMethod(); + // Always dispatch key events to the input method first, to make sure + // that the input method's hotkeys work all time. + if (ime) { + ime->DispatchKeyEvent(keyev); + return true; + } + return root->ProcessKeyEvent(keyev); } case ButtonPress: |