ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h - Issue 1284433002: Revise ui::DomKey to unify character and non-character codes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h

Issue 1284433002: Revise ui::DomKey to unify character and non-character codes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: IsDead 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

« no previous file with comments | « ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.cc ('k') | ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h

diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h

index 89729a0d95cd835f4deaa804a617d8ed056b48d3..ccc8d650869f68099c928da4a0b88250fb41266e 100644

--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h

+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h

@@ -37,7 +37,6 @@ class EVENTS_OZONE_LAYOUT_EXPORT XkbKeyboardLayoutEngine

bool Lookup(DomCode dom_code,

int flags,

DomKey* dom_key,

- base::char16* character,

KeyboardCode* key_code,

uint32* platform_keycode) const override;

@@ -59,13 +58,12 @@ class EVENTS_OZONE_LAYOUT_EXPORT XkbKeyboardLayoutEngine

// Determines the Windows-based KeyboardCode (VKEY) for a character key,

// accounting for non-US layouts. May return VKEY_UNKNOWN, in which case the

// caller should, as a last resort, obtain a KeyboardCode using

- // |DomCodeToUsLayoutMeaning()|.

+ // |DomCodeToUsLayoutDomKey()|.

KeyboardCode DifficultKeyboardCode(DomCode dom_code,

int ui_flags,

xkb_keycode_t xkb_keycode,

xkb_mod_mask_t xkb_flags,

xkb_keysym_t xkb_keysym,

- DomKey dom_key,

base::char16 character) const;

// Maps DomCode to xkb_keycode_t.

@@ -89,7 +87,7 @@ class EVENTS_OZONE_LAYOUT_EXPORT XkbKeyboardLayoutEngine

virtual bool XkbLookup(xkb_keycode_t xkb_keycode,

xkb_mod_mask_t xkb_flags,

xkb_keysym_t* xkb_keysym,

- base::char16* character) const;

+ uint32_t* character) const;

// Helper for difficult VKEY lookup. If |ui_flags| matches |base_flags|,

// returns |base_character|; otherwise returns the XKB character for