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

Side by Side Diff: ui/base/keycodes/keyboard_code_conversion_x.h

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ 5 #ifndef UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
6 #define UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ 6 #define UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
7 7
8 #include "ui/base/keycodes/keyboard_codes_posix.h" 8 #include "ui/base/keycodes/keyboard_codes_posix.h"
9 #include "ui/base/ui_export.h" 9 #include "ui/base/ui_export.h"
10 10
11 typedef union _XEvent XEvent; 11 typedef union _XEvent XEvent;
12 12
13 namespace ui { 13 namespace ui {
14 14
15 UI_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev); 15 UI_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev);
16 16
17 UI_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym); 17 UI_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym);
18 18
19 // Returns a key symbol on a standard US PC keyboard from an XEvent. 19 // Returns a key symbol on a standard US PC keyboard from an XEvent.
20 // TODO(suzhe,yusukes): Rename this to GetCharacterFromXEvent().
20 UI_EXPORT unsigned int DefaultSymbolFromXEvent(XEvent* xev); 21 UI_EXPORT unsigned int DefaultSymbolFromXEvent(XEvent* xev);
21 22
22 // Converts a KeyboardCode into an X KeySym. 23 // Converts a KeyboardCode into an X KeySym.
23 UI_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift); 24 UI_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift);
24 25
25 // Converts an X keycode into an X KeySym. 26 // Converts an X keycode into an X KeySym.
26 unsigned int DefaultXKeysymFromHardwareKeycode(unsigned int keycode); 27 unsigned int DefaultXKeysymFromHardwareKeycode(unsigned int keycode);
27 28
28 } // namespace ui 29 } // namespace ui
29 30
30 #endif // UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ 31 #endif // UI_BASE_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698