Consolidate/cleanup event cracking code; single out GdkEvents.

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 44 matching lines @@
          (flags & ui::EF_LEFT_BUTTON_DOWN ? IBUS_BUTTON1_MASK : 0) |
          (flags & ui::EF_MIDDLE_BUTTON_DOWN ? IBUS_BUTTON2_MASK : 0) |
          (flags & ui::EF_RIGHT_BUTTON_DOWN ? IBUS_BUTTON3_MASK : 0);
 }
 
 void IBusKeyEventFromViewsKeyEvent(const views::KeyEvent& key,
                                    guint32* ibus_keyval,
                                    guint32* ibus_keycode,
                                    guint32* ibus_state) {
 #if defined(TOUCH_UI)
-  if (key.native_event_2()) {
-    XKeyEvent* x_key = reinterpret_cast<XKeyEvent*>(key.native_event_2());
+  if (key.native_event()) {
+    XKeyEvent* x_key = reinterpret_cast<XKeyEvent*>(key.native_event());
     // Yes, ibus uses X11 keysym. We cannot use XLookupKeysym(), which doesn't
     // translate Shift and CapsLock states.
     KeySym keysym = NoSymbol;
     ::XLookupString(x_key, NULL, 0, &keysym, NULL);
     *ibus_keyval = keysym;
     *ibus_keycode = x_key->keycode;
   }
 #elif defined(TOOLKIT_USES_GTK)
-  if (key.native_event()) {
-    GdkEventKey* gdk_key = reinterpret_cast<GdkEventKey*>(key.native_event());
+  if (key.gdk_event()) {
+    GdkEventKey* gdk_key = reinterpret_cast<GdkEventKey*>(key.gdk_event());
     *ibus_keyval = gdk_key->keyval;
     *ibus_keycode = gdk_key->hardware_keycode;
   }
 #endif
   else {
     // GdkKeyCodeForWindowsKeyCode() is actually nothing to do with Gtk, we
     // probably want to rename it to something like XKeySymForWindowsKeyCode(),
     // because Gtk keyval is actually same as X KeySym.
     *ibus_keyval = ui::GdkKeyCodeForWindowsKeyCode(
         key.key_code(), key.IsShiftDown() ^ key.IsCapsLockDown());
@@ skipping 129 matching lines @@
     : input_method_(input_method),
       type_(key.type()),
       flags_(key.flags()),
       key_code_(key.key_code()),
       character_(key.GetCharacter()),
       unmodified_character_(key.GetUnmodifiedCharacter()),
       ibus_keyval_(ibus_keyval) {
   DCHECK(input_method_);
 
 #if defined(TOUCH_UI)
-  if (key.native_event_2())
-    x_event_ = *reinterpret_cast<XKeyEvent*>(key.native_event_2());
+  if (key.native_event())
+    x_event_ = *reinterpret_cast<XKeyEvent*>(key.native_event());
   else
     memset(&x_event_, 0, sizeof(x_event_));
 #endif
 }
 
 InputMethodIBus::PendingKeyEvent::~PendingKeyEvent() {
   if (input_method_)
     input_method_->FinishPendingKeyEvent(this);
 }
 
 void InputMethodIBus::PendingKeyEvent::ProcessPostIME(bool handled) {
   if (!input_method_)
     return;
 
 #if defined(TOUCH_UI)
   if (x_event_.type == KeyPress || x_event_.type == KeyRelease) {
-    Event::FromNativeEvent2 from_native;
-    KeyEvent key(reinterpret_cast<XEvent*>(&x_event_), from_native);
+    KeyEvent key(reinterpret_cast<XEvent*>(&x_event_));
     input_method_->ProcessKeyEventPostIME(key, ibus_keyval_, handled);
     return;
   }
 #endif
   KeyEvent key(type_, key_code_, flags_);
   if (key_code_ == ui::VKEY_UNKNOWN) {
     key.set_character(character_);
     key.set_unmodified_character(unmodified_character_);
   }
   input_method_->ProcessKeyEventPostIME(key, ibus_keyval_, handled);
@@ skipping 756 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