Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Unified Diff: views/ime/input_method_gtk.cc

Issue 7942004: Consolidate/cleanup event cracking code; single out GdkEvents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge removal of compact nav. Created 9 years, 3 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/focus/accelerator_handler_touch.cc ('k') | views/ime/input_method_ibus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/ime/input_method_gtk.cc
diff --git a/views/ime/input_method_gtk.cc b/views/ime/input_method_gtk.cc
index 6cb35b2be242a2f6aebb880a726e42ec13e8a62a..146cf6a34a1bc01ed39ebc42483e164d15c40d42 100644
--- a/views/ime/input_method_gtk.cc
+++ b/views/ime/input_method_gtk.cc
@@ -127,8 +127,8 @@ void InputMethodGtk::DispatchKeyEvent(const KeyEvent& key) {
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);
@@ -152,7 +152,7 @@ void InputMethodGtk::DispatchKeyEvent(const KeyEvent& 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);
}
« no previous file with comments | « views/focus/accelerator_handler_touch.cc ('k') | views/ime/input_method_ibus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698