ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc - Issue 1136503003: Consolidate ui/events/keycodes/dom[34]/ into .../dom/

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.cc

Issue 1136503003: Consolidate ui/events/keycodes/dom[34]/ into .../dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 7 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_unittest.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.cc

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

index e97803928f1c299b4f01b7e33cc39e52704642fc..9d75d0de403a380a7c60349e10ac6a7a7bce424c 100644

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

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

@@ -14,9 +14,9 @@

#include "base/thread_task_runner_handle.h"

#include "base/threading/worker_pool.h"

#include "ui/events/event_constants.h"

-#include "ui/events/keycodes/dom3/dom_code.h"

-#include "ui/events/keycodes/dom3/dom_key.h"

-#include "ui/events/keycodes/dom4/keycode_converter.h"

+#include "ui/events/keycodes/dom/dom_code.h"

+#include "ui/events/keycodes/dom/dom_key.h"

+#include "ui/events/keycodes/dom/keycode_converter.h"

#include "ui/events/keycodes/keyboard_code_conversion.h"

#include "ui/events/keycodes/keyboard_code_conversion_xkb.h"

#include "ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.h"