diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 23:33:30 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 23:33:30 +0000 |
| commit | 988ace29e4f1990cf22f7d9781049e0b14d3d5cd (patch) | |
| tree | 24ed6ac562ae60944980dd45ea1394a0f5b01902 /views/focus/accelerator_handler_touch.cc | |
| parent | 4776115ccf7fff738be23e7638248209ba00417c (diff) | |
| download | chromium_src-988ace29e4f1990cf22f7d9781049e0b14d3d5cd.zip chromium_src-988ace29e4f1990cf22f7d9781049e0b14d3d5cd.tar.gz chromium_src-988ace29e4f1990cf22f7d9781049e0b14d3d5cd.tar.bz2 | |
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=72040
TEST=Key event handling in win/linux_views/touch; extension input API SendKeyboardEventInputFunction use.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=82713
Review URL: http://codereview.chromium.org/6823055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82751 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, 1 insertions, 8 deletions
diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc index 716cb29..a18bbe1 100644 --- a/views/focus/accelerator_handler_touch.cc +++ b/views/focus/accelerator_handler_touch.cc @@ -179,14 +179,7 @@ bool DispatchXEvent(XEvent* xev) { case KeyRelease: { Event::FromNativeEvent2 from_native; KeyEvent keyev(xev, from_native); - 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); + return widget->OnKeyEvent(keyev); } case ButtonPress: |