diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 06:52:57 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 06:52:57 +0000 |
| commit | 6b7f5d8c0b6103f62e9744d5f06e78d61d7f262f (patch) | |
| tree | 82eb89d2487ccfdf1abef4e26fa73aa6fabd8b91 /ui/base/keycodes/keyboard_code_conversion_x.h | |
| parent | e4853d549ea66da96fb66aba834abcc665f27bed (diff) | |
| download | chromium_src-6b7f5d8c0b6103f62e9744d5f06e78d61d7f262f.zip chromium_src-6b7f5d8c0b6103f62e9744d5f06e78d61d7f262f.tar.gz chromium_src-6b7f5d8c0b6103f62e9744d5f06e78d61d7f262f.tar.bz2 | |
Add Aura support to InputMethodIBus.
- Fix IBusKeyEventFromViewsKeyEvent() so the function could work fine when USE_AURA is defined.
- Rename GdkKeyCodeForWindowsKeyCode() to XKeysymForWindowsKeyCode() since the function actually does not depend on Gtk/Gdk. XKeysymForWindowsKeyCode() is called in IBusKeyEventFromViewsKeyEvent() when USE_AURA is defined.
- This CL is based on Peng's work at http://codereview.chromium.org/8423037.
With this CL, we can use IME on Omnibox since NativeWidgetAura already has some preliminary IME support (http://codereview.chromium.org/8183011/) while RWHVA doesn't.
BUG=chromium:97261
TEST=Build Chrome inside Chrome OS chroot with USE=aura, boot the OS, enable a CJK IME, and type something on Omnibox. Verify an IME preedit string appears.
Review URL: http://codereview.chromium.org/8502010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/keycodes/keyboard_code_conversion_x.h')
| -rw-r--r-- | ui/base/keycodes/keyboard_code_conversion_x.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.h b/ui/base/keycodes/keyboard_code_conversion_x.h index e42e02f..7779483 100644 --- a/ui/base/keycodes/keyboard_code_conversion_x.h +++ b/ui/base/keycodes/keyboard_code_conversion_x.h @@ -19,6 +19,9 @@ UI_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym); // Returns a key symbol on a standard US PC keyboard from an XEvent. UI_EXPORT unsigned int DefaultSymbolFromXEvent(XEvent* xev); +// Converts a KeyboardCode into an X KeySym. +UI_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift); + // Converts an X keycode into an X KeySym. unsigned int DefaultXKeysymFromHardwareKeycode(unsigned int keycode); |