Switch to standard integer types in mojo/.

mojo/converters/input_events/input_events_type_converters.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/converters/input_events/input_events_type_converters.h"
 
+#include <stdint.h>
+
 #include <utility>
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 #endif
 
 #include "components/mus/public/interfaces/input_events.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/mojo_extended_key_event_data.h"
@@ skipping 61 matching lines @@
 void SetPointerDataLocationFromEvent(const ui::LocatedEvent& located_event,
                                      mus::mojom::LocationData* location_data) {
   location_data->x = located_event.location_f().x();
   location_data->y = located_event.location_f().y();
   location_data->screen_x = located_event.root_location_f().x();
   location_data->screen_y = located_event.root_location_f().y();
 }
 
 }  // namespace
 
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_NONE) ==
-                  static_cast<int32>(ui::EF_NONE),
+static_assert(static_cast<int32_t>(mus::mojom::EVENT_FLAGS_NONE) ==
+                  static_cast<int32_t>(ui::EF_NONE),
               "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_CAPS_LOCK_DOWN) ==
-                  static_cast<int32>(ui::EF_CAPS_LOCK_DOWN),
+static_assert(static_cast<int32_t>(mus::mojom::EVENT_FLAGS_CAPS_LOCK_DOWN) ==
+                  static_cast<int32_t>(ui::EF_CAPS_LOCK_DOWN),
               "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_SHIFT_DOWN) ==
-                  static_cast<int32>(ui::EF_SHIFT_DOWN),
+static_assert(static_cast<int32_t>(mus::mojom::EVENT_FLAGS_SHIFT_DOWN) ==
+                  static_cast<int32_t>(ui::EF_SHIFT_DOWN),
               "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_CONTROL_DOWN) ==
-                  static_cast<int32>(ui::EF_CONTROL_DOWN),
+static_assert(static_cast<int32_t>(mus::mojom::EVENT_FLAGS_CONTROL_DOWN) ==
+                  static_cast<int32_t>(ui::EF_CONTROL_DOWN),
               "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_ALT_DOWN) ==
-                  static_cast<int32>(ui::EF_ALT_DOWN),
+static_assert(static_cast<int32_t>(mus::mojom::EVENT_FLAGS_ALT_DOWN) ==
+                  static_cast<int32_t>(ui::EF_ALT_DOWN),
               "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_LEFT_MOUSE_BUTTON) ==
-                  static_cast<int32>(ui::EF_LEFT_MOUSE_BUTTON),
+static_assert(static_cast<int32_t>(mus::mojom::EVENT_FLAGS_LEFT_MOUSE_BUTTON) ==
+                  static_cast<int32_t>(ui::EF_LEFT_MOUSE_BUTTON),
               "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_MIDDLE_MOUSE_BUTTON) ==
-                  static_cast<int32>(ui::EF_MIDDLE_MOUSE_BUTTON),
+static_assert(
+    static_cast<int32_t>(mus::mojom::EVENT_FLAGS_MIDDLE_MOUSE_BUTTON) ==
+        static_cast<int32_t>(ui::EF_MIDDLE_MOUSE_BUTTON),
+    "EVENT_FLAGS must match");
+static_assert(
+    static_cast<int32_t>(mus::mojom::EVENT_FLAGS_RIGHT_MOUSE_BUTTON) ==
+        static_cast<int32_t>(ui::EF_RIGHT_MOUSE_BUTTON),
+    "EVENT_FLAGS must match");
+static_assert(static_cast<int32_t>(mus::mojom::EVENT_FLAGS_COMMAND_DOWN) ==
+                  static_cast<int32_t>(ui::EF_COMMAND_DOWN),
               "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_RIGHT_MOUSE_BUTTON) ==
-                  static_cast<int32>(ui::EF_RIGHT_MOUSE_BUTTON),
+static_assert(static_cast<int32_t>(mus::mojom::EVENT_FLAGS_EXTENDED) ==
+                  static_cast<int32_t>(ui::EF_EXTENDED),
               "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_COMMAND_DOWN) ==
-                  static_cast<int32>(ui::EF_COMMAND_DOWN),
+static_assert(static_cast<int32_t>(mus::mojom::EVENT_FLAGS_IS_SYNTHESIZED) ==
+                  static_cast<int32_t>(ui::EF_IS_SYNTHESIZED),
               "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_EXTENDED) ==
-                  static_cast<int32>(ui::EF_EXTENDED),
+static_assert(static_cast<int32_t>(mus::mojom::EVENT_FLAGS_ALTGR_DOWN) ==
+                  static_cast<int32_t>(ui::EF_ALTGR_DOWN),
               "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_IS_SYNTHESIZED) ==
-                  static_cast<int32>(ui::EF_IS_SYNTHESIZED),
-              "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_ALTGR_DOWN) ==
-                  static_cast<int32>(ui::EF_ALTGR_DOWN),
-              "EVENT_FLAGS must match");
-static_assert(static_cast<int32>(mus::mojom::EVENT_FLAGS_MOD3_DOWN) ==
-                  static_cast<int32>(ui::EF_MOD3_DOWN),
+static_assert(static_cast<int32_t>(mus::mojom::EVENT_FLAGS_MOD3_DOWN) ==
+                  static_cast<int32_t>(ui::EF_MOD3_DOWN),
               "EVENT_FLAGS must match");
 
 // static
 mus::mojom::EventType
 TypeConverter<mus::mojom::EventType, ui::EventType>::Convert(
     ui::EventType type) {
   switch (type) {
     case ui::ET_MOUSE_PRESSED:
     case ui::ET_TOUCH_PRESSED:
       return mus::mojom::EVENT_TYPE_POINTER_DOWN;
@@ skipping 37 matching lines @@
   mus::mojom::EventPtr event = mus::mojom::Event::New();
   event->action = type;
   event->flags = mus::mojom::EventFlags(input.flags());
   event->time_stamp = input.time_stamp().ToInternalValue();
 
   if (input.IsMouseEvent()) {
     const ui::LocatedEvent* located_event =
         static_cast<const ui::LocatedEvent*>(&input);
     mus::mojom::PointerDataPtr pointer_data(mus::mojom::PointerData::New());
     // TODO(sky): come up with a better way to handle this.
-    pointer_data->pointer_id = std::numeric_limits<int32>::max();
+    pointer_data->pointer_id = std::numeric_limits<int32_t>::max();
     pointer_data->kind = mus::mojom::POINTER_KIND_MOUSE;
     mus::mojom::LocationDataPtr location_data(mus::mojom::LocationData::New());
     SetPointerDataLocationFromEvent(*located_event, location_data.get());
     pointer_data->location = std::move(location_data);
 
     if (input.IsMouseWheelEvent()) {
       const ui::MouseWheelEvent* wheel_event =
           static_cast<const ui::MouseWheelEvent*>(&input);
 
       mus::mojom::WheelDataPtr wheel_data(mus::mojom::WheelData::New());
@@ skipping 165 matching lines @@
     } break;
 
     default:
       NOTIMPLEMENTED();
   }
   // TODO: need to support time_stamp.
   return nullptr;
 }
 
 }  // namespace mojo