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

Side by Side Diff: ui/events/keycodes/keyboard_code_conversion_xkb.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/keycodes/keyboard_code_conversion_x.cc ('k') | ui/events/ozone/BUILD.gn » ('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 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/keycodes/keyboard_code_conversion_xkb.h" 5 #include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
6 6
7 #include "ui/events/keycodes/dom3/dom_key.h" 7 #include "ui/events/keycodes/dom/dom_key.h"
8 #include "ui/events/keycodes/keyboard_code_conversion.h" 8 #include "ui/events/keycodes/keyboard_code_conversion.h"
9 9
10 namespace ui { 10 namespace ui {
11 11
12 DomKey NonPrintableXKeySymToDomKey(xkb_keysym_t keysym) { 12 DomKey NonPrintableXKeySymToDomKey(xkb_keysym_t keysym) {
13 switch (keysym) { 13 switch (keysym) {
14 case XKB_KEY_BackSpace: 14 case XKB_KEY_BackSpace:
15 return DomKey::BACKSPACE; 15 return DomKey::BACKSPACE;
16 case XKB_KEY_Tab: 16 case XKB_KEY_Tab:
17 case XKB_KEY_KP_Tab: 17 case XKB_KEY_KP_Tab:
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 } 385 }
386 386
387 DomKey XKeySymToDomKey(xkb_keysym_t keysym, base::char16 character) { 387 DomKey XKeySymToDomKey(xkb_keysym_t keysym, base::char16 character) {
388 DomKey dom_key = NonPrintableXKeySymToDomKey(keysym); 388 DomKey dom_key = NonPrintableXKeySymToDomKey(keysym);
389 if (dom_key == DomKey::NONE) 389 if (dom_key == DomKey::NONE)
390 dom_key = CharacterToDomKey(character); 390 dom_key = CharacterToDomKey(character);
391 return dom_key; 391 return dom_key;
392 } 392 }
393 393
394 } // namespace ui 394 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_x.cc ('k') | ui/events/ozone/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698