views/focus/accelerator_handler_touch.cc - Issue 6823055: Consolidate OnKeyEvent and InputMethod code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: views/focus/accelerator_handler_touch.cc

Issue 6823055: Consolidate OnKeyEvent and InputMethod code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Nix RootView from extension_input_api, revert mouse and touch event changes. Created 9 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:

Index: views/focus/accelerator_handler_touch.cc

diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc

index 716cb299ac5912426897383d69fba81f4d4c1d94..a18bbe1f98e521de2b62ba00a66e40f76215cad7 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: