Consolidate OnKeyEvent and InputMethod code.

views/ime/input_method_ibus.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/ime/input_method_ibus.h"
 
 #include <ibus.h>
 
 #include <cstring>
 #include <set>
@@ skipping 291 matching lines @@
                    G_CALLBACK(OnIBusConnectedThunk), this);
   g_signal_connect(bus, "disconnected",
                    G_CALLBACK(OnIBusDisconnectedThunk), this);
 
   // Creates the |context_| if the connection is already established. In such
   // case, we will not get "connected" signal.
   if (ibus_bus_is_connected(bus))
     CreateContext();
 }
 
-void InputMethodIBus::DispatchKeyEvent(const KeyEvent& key) {
+bool InputMethodIBus::OnKeyEvent(const KeyEvent& key) {
   DCHECK(key.type() == ui::ET_KEY_PRESSED || key.type() == ui::ET_KEY_RELEASED);
   DCHECK(widget_focused());
 
   // If |context_| is not usable and |fake_context_| is not created yet, then we
   // can only dispatch the key event as is. We also dispatch the key event
   // directly if the current text input type is ui::TEXT_INPUT_TYPE_PASSWORD,
   // to bypass the input method.
   // Note: We need to send the key event to ibus even if the |context_| is not
   // enabled, so that ibus can have a chance to enable the |context_|.
   if (!(context_focused_ || fake_context_) ||
       GetTextInputType() == ui::TEXT_INPUT_TYPE_PASSWORD) {
-    if (key.type() == ui::ET_KEY_PRESSED)
+    if (key.type() == ui::ET_KEY_PRESSED) {
       ProcessUnfilteredKeyPressEvent(key);
-    else
-      DispatchKeyEventPostIME(key);
-    return;
+      return true;
+    }
+    return false;
   }
 
   guint32 ibus_keyval = 0;
   guint32 ibus_keycode = 0;
   guint32 ibus_state = 0;
   PendingKeyEvent* pending_key =
       NewPendingKeyEvent(key, &ibus_keyval, &ibus_keycode, &ibus_state);
 
   // Note:
   // 1. We currently set timeout to -1, because ibus doesn't have a mechanism to
@@ skipping 14 matching lines @@
   // fully utilize asynchronous communication without potential problem.
   ibus_input_context_process_key_event_async(
       context_focused_ ? context_ : fake_context_,
       ibus_keyval, ibus_keycode, ibus_state, -1, NULL,
       reinterpret_cast<GAsyncReadyCallback>(ProcessKeyEventDone),
       pending_key);
 
   // We don't want to suppress the result generated by this key event, but it
   // may cause problem. See comment in ResetContext() method.
   suppress_next_result_ = false;
+
+  return true;
 }
 
 void InputMethodIBus::OnTextInputTypeChanged(View* view) {
   if (context_ && IsViewFocused(view)) {
     ResetContext();
     UpdateContextFocusState();
   }
 }
 
 void InputMethodIBus::OnCaretBoundsChanged(View* view) {
@@ skipping 616 matching lines @@
   DCHECK_EQ(GetIBus(), bus);
   DCHECK(data);
   IBusInputContext* ic =
       ibus_bus_create_input_context_async_finish(bus, res, NULL);
   if (ic)
     data->StoreOrAbandonInputContext(ic);
   delete data;
 }
 
 }  // namespace views