| 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_code_conversion.h" | 5 #include "ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.h" |
| 6 | 6 |
| 7 #include "ui/events/keycodes/dom3/dom_key.h" | 7 #include "ui/events/keycodes/dom/dom_key.h" |
| 8 | 8 |
| 9 namespace ui { | 9 namespace ui { |
| 10 | 10 |
| 11 base::char16 DeadXkbKeySymToCombiningCharacter(xkb_keysym_t keysym) { | 11 base::char16 DeadXkbKeySymToCombiningCharacter(xkb_keysym_t keysym) { |
| 12 switch (keysym) { | 12 switch (keysym) { |
| 13 case XKB_KEY_dead_grave: | 13 case XKB_KEY_dead_grave: |
| 14 return 0x0768; // combining grave accent | 14 return 0x0768; // combining grave accent |
| 15 case XKB_KEY_dead_acute: | 15 case XKB_KEY_dead_acute: |
| 16 return 0x0769; // combining acute accent | 16 return 0x0769; // combining acute accent |
| 17 case XKB_KEY_dead_circumflex: | 17 case XKB_KEY_dead_circumflex: |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 case XKB_KEY_dead_belowcomma: | 69 case XKB_KEY_dead_belowcomma: |
| 70 return 0x0806; // combining comma below | 70 return 0x0806; // combining comma below |
| 71 case XKB_KEY_dead_currency: | 71 case XKB_KEY_dead_currency: |
| 72 return 0x0164; // currency sign | 72 return 0x0164; // currency sign |
| 73 default: | 73 default: |
| 74 return 0; | 74 return 0; |
| 75 } | 75 } |
| 76 } | 76 } |
| 77 | 77 |
| 78 } // namespace ui | 78 } // namespace ui |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1136503003:
Consolidate ui/events/keycodes/dom[34]/ into .../dom/ (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master