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

Unified Diff: remoting/client/key_event_mapper.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 5 years 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 | « remoting/client/key_event_mapper.h ('k') | remoting/client/key_event_mapper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/key_event_mapper.cc
diff --git a/remoting/client/key_event_mapper.cc b/remoting/client/key_event_mapper.cc
index c6e5958f170e82e20843cf4a407f66bb994cf43d..85bda275d8d89083d3f71cc6c26e10ac1a452c06 100644
--- a/remoting/client/key_event_mapper.cc
+++ b/remoting/client/key_event_mapper.cc
@@ -21,7 +21,7 @@ void KeyEventMapper::SetTrapCallback(KeyTrapCallback callback) {
trap_callback = callback;
}
-void KeyEventMapper::TrapKey(uint32 usb_keycode, bool trap_key) {
+void KeyEventMapper::TrapKey(uint32_t usb_keycode, bool trap_key) {
if (trap_key) {
trapped_keys.insert(usb_keycode);
} else {
@@ -29,7 +29,8 @@ void KeyEventMapper::TrapKey(uint32 usb_keycode, bool trap_key) {
}
}
-void KeyEventMapper::RemapKey(uint32 in_usb_keycode, uint32 out_usb_keycode) {
+void KeyEventMapper::RemapKey(uint32_t in_usb_keycode,
+ uint32_t out_usb_keycode) {
if (in_usb_keycode == out_usb_keycode) {
mapped_keys.erase(in_usb_keycode);
} else {
@@ -47,7 +48,7 @@ void KeyEventMapper::InjectKeyEvent(const protocol::KeyEvent& event) {
}
// Re-map mapped keys to the new value before passing them on.
- std::map<uint32,uint32>::iterator mapped =
+ std::map<uint32_t, uint32_t>::iterator mapped =
mapped_keys.find(event.usb_keycode());
if (mapped != mapped_keys.end()) {
protocol::KeyEvent new_event(event);
« no previous file with comments | « remoting/client/key_event_mapper.h ('k') | remoting/client/key_event_mapper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698