Consolidate/cleanup event cracking code; single out GdkEvents.

views/ime/input_method_gtk.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_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
@@ skipping 109 matching lines @@
   if (!GetTextInputClient()) {
     DispatchKeyEventPostIME(key);
     return;
   }
 
   handling_key_event_ = true;
   composition_changed_ = false;
   result_text_.clear();
 
   // If it's a fake key event, then we need to synthesize a GdkEventKey.
-  GdkEvent* event = key.native_event() ? key.native_event() :
-                                         SynthesizeGdkEventKey(key);
+  GdkEvent* event = key.gdk_event() ? key.gdk_event() :
+                                      SynthesizeGdkEventKey(key);
   gboolean filtered = gtk_im_context_filter_keypress(
       context_focused_ ? context_ : context_simple_, &event->key);
 
   handling_key_event_ = false;
 
   const View* old_focused_view = focused_view();
   if (key.type() == ui::ET_KEY_PRESSED && filtered)
     ProcessFilteredKeyPressEvent(key);
 
   // Ensure no focus change from processing the key event.
   if (old_focused_view == focused_view()) {
     if (HasInputMethodResult())
       ProcessInputMethodResult(key, filtered);
     // Ensure no focus change sending input method results to the focused View.
     if (old_focused_view == focused_view()) {
       if (key.type() == ui::ET_KEY_PRESSED && !filtered)
         ProcessUnfilteredKeyPressEvent(key);
       else if (key.type() == ui::ET_KEY_RELEASED)
         DispatchKeyEventPostIME(key);
     }
   }
 
   // Free the synthesized event if there was no underlying native event.
-  if (event != key.native_event())
+  if (event != key.gdk_event())
     gdk_event_free(event);
 }
 
 void InputMethodGtk::OnTextInputTypeChanged(View* view) {
   if (IsViewFocused(view)) {
     DCHECK(!composing_text_);
     UpdateContextFocusState();
   }
   InputMethodBase::OnTextInputTypeChanged(view);
 }
@@ skipping 275 matching lines @@
     gtk_im_context_set_client_window(context_simple_, widget->window);
   }
 }
 
 void InputMethodGtk::OnWidgetUnrealize(GtkWidget* widget) {
   gtk_im_context_set_client_window(context_, NULL);
   gtk_im_context_set_client_window(context_simple_, NULL);
 }
 
 }  // namespace views