diff options
| author | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 07:32:15 +0000 |
|---|---|---|
| committer | yukishiino@chromium.org <yukishiino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 07:32:15 +0000 |
| commit | 10d6922a573ccd0845a59b7b8171877e0feb1bc7 (patch) | |
| tree | 107b8a7265e104efc29029755ecb42586d30021b /chrome/browser/ui/libgtk2ui | |
| parent | b6c74cd512dd5ce3c42a0862a2de0b36a32fb2be (diff) | |
| download | chromium_src-10d6922a573ccd0845a59b7b8171877e0feb1bc7.zip chromium_src-10d6922a573ccd0845a59b7b8171877e0feb1bc7.tar.gz chromium_src-10d6922a573ccd0845a59b7b8171877e0feb1bc7.tar.bz2 | |
Removes DispatchFabricatedKeyEvent to simplify InputMethodLinuxX11.
Following a series of refactoring by Hiro, removes DispatchFabricatedKeyEvent, which is almost a dup of DispatchKeyEvent.
TEST=none
Review URL: https://codereview.chromium.org/98443002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/libgtk2ui')
| -rw-r--r-- | chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc index fb47c47..7a1364b 100644 --- a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc +++ b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc @@ -13,11 +13,13 @@ #include <X11/X.h> #include <X11/Xlib.h> +#include "base/event_types.h" #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/composition_text_util_pango.h" #include "ui/base/ime/text_input_client.h" +#include "ui/events/event.h" namespace { @@ -144,12 +146,16 @@ X11InputMethodContextImplGtk2::~X11InputMethodContextImplGtk2() { // Overriden from ui::LinuxInputMethodContext bool X11InputMethodContextImplGtk2::DispatchKeyEvent( - const base::NativeEvent& native_key_event) { + const ui::KeyEvent& key_event) { + if (!key_event.HasNativeEvent()) + return false; + // The caller must call Focus() first. if (!gtk_context_) return false; // Translate a XKeyEvent to a GdkEventKey. + const base::NativeEvent& native_key_event = key_event.native_event(); GdkEvent* event = GdkEventFromXKeyEvent( native_key_event->xkey, IsKeycodeModifierKey(native_key_event->xkey.keycode)); diff --git a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h index 2ea0d4e..979dcf2 100644 --- a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h +++ b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h @@ -26,8 +26,7 @@ class X11InputMethodContextImplGtk2 : public ui::LinuxInputMethodContext { virtual ~X11InputMethodContextImplGtk2(); // Overriden from ui::LinuxInputMethodContext - virtual bool DispatchKeyEvent(const base::NativeEvent& native_key_event) - OVERRIDE; + virtual bool DispatchKeyEvent(const ui::KeyEvent& key_event) OVERRIDE; virtual void Reset() OVERRIDE; virtual base::i18n::TextDirection GetInputTextDirection() const OVERRIDE; virtual void OnTextInputTypeChanged(ui::TextInputType text_input_type) |