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

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

Issue 24257011: Revert "Revert 224496 "Move ui/base/latency_info* to ui/events"" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp bustage Created 7 years, 2 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 unified diff | Download patch
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_win.h ('k') | ui/events/latency_info.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ 5 #ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
6 #define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ 6 #define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "ui/base/ui_export.h" 9 #include "ui/events/events_export.h"
10 #include "ui/events/keycodes/keyboard_codes_posix.h" 10 #include "ui/events/keycodes/keyboard_codes_posix.h"
11 11
12 typedef union _XEvent XEvent; 12 typedef union _XEvent XEvent;
13 13
14 namespace ui { 14 namespace ui {
15 15
16 UI_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev); 16 EVENTS_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev);
17 17
18 UI_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym); 18 EVENTS_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym);
19 19
20 // Returns a character on a standard US PC keyboard from an XEvent. 20 // Returns a character on a standard US PC keyboard from an XEvent.
21 UI_EXPORT uint16 GetCharacterFromXEvent(XEvent* xev); 21 EVENTS_EXPORT uint16 GetCharacterFromXEvent(XEvent* xev);
22 22
23 // Converts a KeyboardCode into an X KeySym. 23 // Converts a KeyboardCode into an X KeySym.
24 UI_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift); 24 EVENTS_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift);
25 25
26 // Converts an X keycode into an X KeySym. 26 // Converts an X keycode into an X KeySym.
27 unsigned int DefaultXKeysymFromHardwareKeycode(unsigned int keycode); 27 unsigned int DefaultXKeysymFromHardwareKeycode(unsigned int keycode);
28 28
29 } // namespace ui 29 } // namespace ui
30 30
31 #endif // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_ 31 #endif // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
OLDNEW
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_win.h ('k') | ui/events/latency_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698