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

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: