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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"	5 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"

6	6

7 #include <xkbcommon/xkbcommon-names.h>	7 #include <xkbcommon/xkbcommon-names.h>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/location.h"	10 #include "base/location.h"

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "base/single_thread_task_runner.h"	12 #include "base/single_thread_task_runner.h"

13 #include "base/task_runner.h"	13 #include "base/task_runner.h"

14 #include "base/thread_task_runner_handle.h"	14 #include "base/thread_task_runner_handle.h"

15 #include "base/threading/worker_pool.h"	15 #include "base/threading/worker_pool.h"

16 #include "ui/events/event_constants.h"	16 #include "ui/events/event_constants.h"

17 #include "ui/events/keycodes/dom3/dom_code.h"	17 #include "ui/events/keycodes/dom/dom_code.h"

18 #include "ui/events/keycodes/dom3/dom_key.h"	18 #include "ui/events/keycodes/dom/dom_key.h"

19 #include "ui/events/keycodes/dom4/keycode_converter.h"	19 #include "ui/events/keycodes/dom/keycode_converter.h"

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

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

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

23	23

24 namespace ui {	24 namespace ui {

25	25

26 namespace {	26 namespace {

27	27

28 typedef base::Callback<void(const std::string&,	28 typedef base::Callback<void(const std::string&,

29 scoped_ptr<char, base::FreeDeleter>)>	29 scoped_ptr<char, base::FreeDeleter>)>

(...skipping 909 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
939 close_index = layout_name.size();	939 close_index = layout_name.size();

940 *layout_variant = layout_name.substr(parentheses_index + 1,	940 *layout_variant = layout_name.substr(parentheses_index + 1,

941 close_index - parentheses_index - 1);	941 close_index - parentheses_index - 1);

942 } else if (dash_index != std::string::npos) {	942 } else if (dash_index != std::string::npos) {

943 *layout_id = layout_name.substr(0, dash_index);	943 *layout_id = layout_name.substr(0, dash_index);

944 *layout_variant = layout_name.substr(dash_index + 1);	944 *layout_variant = layout_name.substr(dash_index + 1);

945 }	945 }

946 }	946 }

947	947

948 } // namespace ui	948 } // namespace ui

OLD	NEW