Consolidate OnKeyEvent and InputMethod code.

views/focus/accelerator_handler_touch.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/focus/accelerator_handler.h"
 
 #include <bitset>
 #include <gtk/gtk.h>
 #if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
@@ skipping 161 matching lines @@
 
   GdkWindow* gwind = gdk_window_lookup_for_display(gdisp, xwindow);
   Widget* widget = FindWidgetForGdkWindow(gwind);
   if (widget) {
     RootView* root = widget->GetRootView();
     switch (xev->type) {
       case KeyPress:
       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);

[James Su, 2011/04/25 03:37:03]

This change breaks IME when using hardware keyboard.

[James Su, 2011/04/25 03:46:32]

To be more clear: we always need to dispatch a key event to the input method
before views hierarchy. Otherwise, even though most key events may be dispatched
to the input method through WidgetGtk::OnEventKey if widget->OnKeyEvent(keyev)
returns false, functions of the input method may be broken if some keys are
handled in widget->OnKeyEvent(keyev).
And this change may cause a key event to be dispatched to views hierarchy twice.

[msw, 2011/04/25 17:52:38]

Done. Logic restored with updated call to Widget.

       }
 
       case ButtonPress:
       case ButtonRelease: {
         if (xev->xbutton.button == 4 || xev->xbutton.button == 5) {
           // Scrolling the wheel triggers button press/release events.
           Event::FromNativeEvent2 from_native;
           MouseWheelEvent wheelev(xev, from_native);
           return root->OnMouseWheel(wheelev);
         } else {
@@ skipping 45 matching lines @@
 }
 
 base::MessagePumpGlibXDispatcher::DispatchStatus
     AcceleratorHandler::DispatchX(XEvent* xev) {
   return DispatchXEvent(xev) ?
       base::MessagePumpGlibXDispatcher::EVENT_PROCESSED :
       base::MessagePumpGlibXDispatcher::EVENT_IGNORED;
 }
 
 }  // namespace views