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

Unified Diff: remoting/protocol/test_event_matchers.h

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/protocol/stream_channel_factory.h ('k') | remoting/protocol/third_party_authenticator_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/test_event_matchers.h
diff --git a/remoting/protocol/test_event_matchers.h b/remoting/protocol/test_event_matchers.h
index a8e4afcef68fa8b154ef778d9bfe1d733f3d3147..2961a67a7caed266e27ef0d045eafdc44f400acb 100644
--- a/remoting/protocol/test_event_matchers.h
+++ b/remoting/protocol/test_event_matchers.h
@@ -5,6 +5,8 @@
#ifndef REMOTING_PROTOCOL_TEST_EVENT_MATCHERS_H_
#define REMOTING_PROTOCOL_TEST_EVENT_MATCHERS_H_
+#include <stdint.h>
+
#include <cmath>
#include "remoting/proto/event.pb.h"
@@ -16,26 +18,25 @@ namespace protocol {
namespace test {
MATCHER_P2(EqualsKeyEvent, usb_keycode, pressed, "") {
- return arg.usb_keycode() == static_cast<uint32>(usb_keycode) &&
+ return arg.usb_keycode() == static_cast<uint32_t>(usb_keycode) &&
arg.pressed() == pressed;
}
MATCHER_P2(EqualsKeyEventWithCapsLock, usb_keycode, pressed, "") {
- return arg.usb_keycode() == static_cast<uint32>(usb_keycode) &&
+ return arg.usb_keycode() == static_cast<uint32_t>(usb_keycode) &&
arg.pressed() == pressed &&
arg.lock_states() == KeyEvent::LOCK_STATES_CAPSLOCK;
}
MATCHER_P2(EqualsKeyEventWithNumLock, usb_keycode, pressed, "") {
- return arg.usb_keycode() == static_cast<uint32>(usb_keycode) &&
+ return arg.usb_keycode() == static_cast<uint32_t>(usb_keycode) &&
arg.pressed() == pressed &&
arg.lock_states() == KeyEvent::LOCK_STATES_NUMLOCK;
}
MATCHER_P2(EqualsKeyEventWithoutLockStates, usb_keycode, pressed, "") {
- return arg.usb_keycode() == static_cast<uint32>(usb_keycode) &&
- arg.pressed() == pressed &&
- !arg.has_lock_states();
+ return arg.usb_keycode() == static_cast<uint32_t>(usb_keycode) &&
+ arg.pressed() == pressed && !arg.has_lock_states();
}
MATCHER_P(EqualsTextEvent, text, "") {
« no previous file with comments | « remoting/protocol/stream_channel_factory.h ('k') | remoting/protocol/third_party_authenticator_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698