diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 00:33:24 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 00:33:24 +0000 |
| commit | b53c15cd233aa4e86c192532f3b0f00426292594 (patch) | |
| tree | 59054481bfcb5f751bc0f3a82822edcffeaec925 | |
| parent | 15caf87218526c1d6c3e4e3d06988ba504ca2e54 (diff) | |
| download | chromium_src-b53c15cd233aa4e86c192532f3b0f00426292594.zip chromium_src-b53c15cd233aa4e86c192532f3b0f00426292594.tar.gz chromium_src-b53c15cd233aa4e86c192532f3b0f00426292594.tar.bz2 | |
Valgrind: Fix the gcc 4.2 mac build.
BUG=none
TEST=none
R=groby@chromium.org
Review URL: http://codereview.chromium.org/8590010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110390 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/base/keycodes/keyboard_code_conversion.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/base/keycodes/keyboard_code_conversion.cc b/ui/base/keycodes/keyboard_code_conversion.cc index eaaf1fa..0016f6d 100644 --- a/ui/base/keycodes/keyboard_code_conversion.cc +++ b/ui/base/keycodes/keyboard_code_conversion.cc @@ -57,10 +57,12 @@ uint16 GetCharacterFromKeyCode(KeyboardCode key_code, int flags) { } // Normal characters - if (key_code >= VKEY_0 && key_code <= VKEY_9) - return shift ? ")!@#$%^&*("[key_code - VKEY_0] : key_code; - else if (key_code >= VKEY_NUMPAD0 && key_code <= VKEY_NUMPAD9) + if (key_code >= VKEY_0 && key_code <= VKEY_9) { + return shift ? ")!@#$%^&*("[key_code - VKEY_0] : + static_cast<uint16>(key_code); + } else if (key_code >= VKEY_NUMPAD0 && key_code <= VKEY_NUMPAD9) { return key_code - VKEY_NUMPAD0 + '0'; + } switch (key_code) { case VKEY_TAB: |