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

Unified Diff: ui/events/platform/x11/keyboard_code_conversion_x11.h

Issue 1287103004: Sync ui/events to chromium @ https://codereview.chromium.org/1210203002 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 4 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
Index: ui/events/platform/x11/keyboard_code_conversion_x11.h
diff --git a/ui/events/platform/x11/keyboard_code_conversion_x11.h b/ui/events/platform/x11/keyboard_code_conversion_x11.h
deleted file mode 100644
index f0c7231470d10497b1149b10578fdb5f64c91c3d..0000000000000000000000000000000000000000
--- a/ui/events/platform/x11/keyboard_code_conversion_x11.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_EVENTS_PLATFORM_X11_KEYBOARD_CODE_CONVERSION_X11_H_
-#define UI_EVENTS_PLATFORM_X11_KEYBOARD_CODE_CONVERSION_X11_H_
-
-#include "base/basictypes.h"
-#include "ui/events/events_base_export.h"
-#include "ui/events/keycodes/keyboard_codes_posix.h"
-
-typedef union _XEvent XEvent;
-typedef struct _XDisplay XDisplay;
-
-namespace ui {
-
-EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(const XEvent* xev);
-
-EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym);
-
-EVENTS_BASE_EXPORT const char* CodeFromXEvent(const XEvent* xev);
-
-// Returns a character on a standard US PC keyboard from an XEvent.
-EVENTS_BASE_EXPORT uint16 GetCharacterFromXEvent(const XEvent* xev);
-
-// Converts a KeyboardCode into an X KeySym.
-EVENTS_BASE_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode,
- bool shift);
-
-// Returns a XKeyEvent keycode (scancode) for a KeyboardCode. Keyboard layouts
-// are usually not injective, so inverse mapping should be avoided when
-// practical. A round-trip keycode -> KeyboardCode -> keycode will not
-// necessarily return the original keycode.
-EVENTS_BASE_EXPORT unsigned int XKeyCodeForWindowsKeyCode(KeyboardCode key_code,
- int flags,
- XDisplay* display);
-
-// Converts an X keycode into ui::KeyboardCode.
-EVENTS_BASE_EXPORT KeyboardCode
-DefaultKeyboardCodeFromHardwareKeycode(unsigned int hardware_code);
-
-// Initializes a core XKeyEvent from an XI2 key event.
-EVENTS_BASE_EXPORT void InitXKeyEventFromXIDeviceEvent(const XEvent& src,
- XEvent* dst);
-
-} // namespace ui
-
-#endif // UI_EVENTS_PLATFORM_X11_KEYBOARD_CODE_CONVERSION_X11_H_
« no previous file with comments | « ui/events/platform/x11/hotplug_event_handler_x11.cc ('k') | ui/events/platform/x11/keyboard_code_conversion_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698