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

Side by Side Diff: remoting/client/jni/android_keymap.cc

Issue 1542203002: Switch to standard integer types in remoting/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@int-remoting-host
Patch Set: Created 4 years, 12 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 | « remoting/client/jni/android_keymap.h ('k') | remoting/client/jni/chromoting_jni_instance.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "remoting/client/jni/android_keymap.h" 5 #include "remoting/client/jni/android_keymap.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace { 9 namespace {
10 10
11 // These must be defined in the same order as the Android keycodes in 11 // These must be defined in the same order as the Android keycodes in
12 // <android/keycodes.h> and 12 // <android/keycodes.h> and
13 // "ui/events/keycodes/keyboard_code_conversion_android.cc" . Some of these 13 // "ui/events/keycodes/keyboard_code_conversion_android.cc" . Some of these
14 // mappings assume a US keyboard layout for now. 14 // mappings assume a US keyboard layout for now.
15 const uint32 usb_keycodes[] = { 15 const uint32_t usb_keycodes[] = {
16 0, // UNKNOWN 16 0, // UNKNOWN
17 0, // SOFT_LEFT 17 0, // SOFT_LEFT
18 0, // SOFT_RIGHT 18 0, // SOFT_RIGHT
19 0, // HOME 19 0, // HOME
20 0, // BACK 20 0, // BACK
21 0, // CALL 21 0, // CALL
22 0, // ENDCALL 22 0, // ENDCALL
23 23
24 0x070027, // 0 24 0x070027, // 0
25 0x07001e, // 1 25 0x07001e, // 1
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 0x070058, // NUMPAD_ENTER 196 0x070058, // NUMPAD_ENTER
197 0x070067, // NUMPAD_EQUALS 197 0x070067, // NUMPAD_EQUALS
198 0x0700b6, // NUMPAD_LEFT_PAREN 198 0x0700b6, // NUMPAD_LEFT_PAREN
199 0x0700b7, // NUMPAD_RIGHT_PAREN 199 0x0700b7, // NUMPAD_RIGHT_PAREN
200 }; 200 };
201 201
202 } // namespace 202 } // namespace
203 203
204 namespace remoting { 204 namespace remoting {
205 205
206 uint32 AndroidKeycodeToUsbKeycode(size_t android) { 206 uint32_t AndroidKeycodeToUsbKeycode(size_t android) {
207 if (android >= sizeof (usb_keycodes) / sizeof (uint32)) { 207 if (android >= sizeof(usb_keycodes) / sizeof(uint32_t)) {
208 LOG(WARNING) << "Attempted to decode out-of-range Android keycode"; 208 LOG(WARNING) << "Attempted to decode out-of-range Android keycode";
209 return 0; 209 return 0;
210 } 210 }
211 211
212 return usb_keycodes[android]; 212 return usb_keycodes[android];
213 } 213 }
214 214
215 } // namespace remoting 215 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/jni/android_keymap.h ('k') | remoting/client/jni/chromoting_jni_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698