Index: mojo/converters/ime/ime_type_converters.cc |
diff --git a/mojo/converters/ime/ime_type_converters.cc b/mojo/converters/ime/ime_type_converters.cc |
index 7b40ef69fbde814a8a447590a4b537524173da1d..55a575766e713ad4374a873d58a50e9f45763f3e 100644 |
--- a/mojo/converters/ime/ime_type_converters.cc |
+++ b/mojo/converters/ime/ime_type_converters.cc |
@@ -4,14 +4,15 @@ |
#include "mojo/converters/ime/ime_type_converters.h" |
-#include "base/basictypes.h" |
+#include <stdint.h> |
+ |
#include "base/macros.h" |
namespace mojo { |
-#define TEXT_INPUT_TYPE_ASSERT(NAME) \ |
- static_assert(static_cast<int32>(TEXT_INPUT_TYPE_##NAME) == \ |
- static_cast<int32>(ui::TEXT_INPUT_TYPE_##NAME), \ |
+#define TEXT_INPUT_TYPE_ASSERT(NAME) \ |
+ static_assert(static_cast<int32_t>(TEXT_INPUT_TYPE_##NAME) == \ |
+ static_cast<int32_t>(ui::TEXT_INPUT_TYPE_##NAME), \ |
"TEXT_INPUT_TYPE must match") |
TEXT_INPUT_TYPE_ASSERT(NONE); |
TEXT_INPUT_TYPE_ASSERT(TEXT); |
@@ -29,9 +30,9 @@ TEXT_INPUT_TYPE_ASSERT(TIME); |
TEXT_INPUT_TYPE_ASSERT(WEEK); |
TEXT_INPUT_TYPE_ASSERT(TEXT_AREA); |
-#define TEXT_INPUT_FLAG_ASSERT(NAME) \ |
- static_assert(static_cast<int32>(TEXT_INPUT_FLAG_##NAME) == \ |
- static_cast<int32>(ui::TEXT_INPUT_FLAG_##NAME), \ |
+#define TEXT_INPUT_FLAG_ASSERT(NAME) \ |
+ static_assert(static_cast<int32_t>(TEXT_INPUT_FLAG_##NAME) == \ |
+ static_cast<int32_t>(ui::TEXT_INPUT_FLAG_##NAME), \ |
"TEXT_INPUT_FLAG must match") |
TEXT_INPUT_FLAG_ASSERT(NONE); |
TEXT_INPUT_FLAG_ASSERT(AUTOCOMPLETE_ON); |