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

Unified Diff: ui/events/keycodes/keyboard_code_conversion_x.cc

Issue 398203004: Build fix on Linux 64 bits with GCC 4.8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/keycodes/keyboard_code_conversion_x.cc
diff --git a/ui/events/keycodes/keyboard_code_conversion_x.cc b/ui/events/keycodes/keyboard_code_conversion_x.cc
index 7f5511f0eefbf1d1c22e46eb96134f7e4cf43d7a..dd5efe68f63d9a70b5c446f26b864967f2f74a19 100644
--- a/ui/events/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_x.cc
@@ -55,7 +55,7 @@ namespace {
// Please refer to crbug.com/386066.
//
const struct MAP0 {
- uint16 ch0;
+ KeySym ch0;
uint8 vk;
bool operator()(const MAP0& m1, const MAP0& m2) const {
return m1.ch0 < m2.ch0;
@@ -115,8 +115,8 @@ const struct MAP0 {
};
const struct MAP1 {
- uint16 ch0;
- uint8 sc;
+ KeySym ch0;
+ unsigned sc;
uint8 vk;
bool operator()(const MAP1& m1, const MAP1& m2) const {
if (m1.ch0 == m2.ch0)
@@ -300,9 +300,9 @@ const struct MAP1 {
};
const struct MAP2 {
- uint16 ch0;
- uint8 sc;
- uint16 ch1;
+ KeySym ch0;
+ unsigned sc;
+ KeySym ch1;
uint8 vk;
bool operator()(const MAP2& m1, const MAP2& m2) const {
if (m1.ch0 == m2.ch0 && m1.sc == m2.sc)
@@ -344,10 +344,10 @@ const struct MAP2 {
};
const struct MAP3 {
- uint16 ch0;
- uint8 sc;
- uint16 ch1;
- uint16 ch2;
+ KeySym ch0;
+ unsigned sc;
+ KeySym ch1;
+ KeySym ch2;
uint8 vk;
bool operator()(const MAP3& m1, const MAP3& m2) const {
if (m1.ch0 == m2.ch0 && m1.sc == m2.sc && m1.ch1 == m2.ch1)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698