Index: ui/events/event.cc |
diff --git a/ui/events/event.cc b/ui/events/event.cc |
index ce99ff82d68ee08dd10cdfe51f89c3bedfcfc56a..a9ab0bdca18592f9a461583c3853117c1da6df42 100644 |
--- a/ui/events/event.cc |
+++ b/ui/events/event.cc |
@@ -503,7 +503,8 @@ void LocatedEvent::UpdateForRootTransform( |
PointerDetails::PointerDetails() {} |
-PointerDetails::PointerDetails(EventPointerType pointer_type, int pointer_id) |
+PointerDetails::PointerDetails(EventPointerType pointer_type, |
+ PointerId pointer_id) |
: PointerDetails(pointer_type, |
pointer_id, |
/* radius_x */ 0.0f, |
@@ -511,7 +512,7 @@ PointerDetails::PointerDetails(EventPointerType pointer_type, int pointer_id) |
/* force */ std::numeric_limits<float>::quiet_NaN()) {} |
PointerDetails::PointerDetails(EventPointerType pointer_type, |
- int pointer_id, |
+ PointerId pointer_id, |
float radius_x, |
float radius_y, |
float force, |
@@ -539,7 +540,7 @@ PointerDetails::PointerDetails(EventPointerType pointer_type, |
PointerDetails::PointerDetails(EventPointerType pointer_type, |
const gfx::Vector2d& pointer_offset, |
- int pointer_id) |
+ PointerId pointer_id) |
: PointerDetails(pointer_type, pointer_id) { |
offset = pointer_offset; |
} |
@@ -556,7 +557,7 @@ PointerDetails::PointerDetails(const PointerDetails& other) |
id(other.id), |
offset(other.offset) {} |
-const int PointerDetails::kUnknownPointerId = -1; |
+const PointerId PointerDetails::kUnknownPointerId = -1; |
//////////////////////////////////////////////////////////////////////////////// |
// MouseEvent |
@@ -757,7 +758,8 @@ void MouseEvent::SetClickCount(int click_count) { |
set_flags(f); |
} |
-const int MouseEvent::kMousePointerId = std::numeric_limits<int32_t>::max(); |
+const PointerId MouseEvent::kMousePointerId = |
+ std::numeric_limits<PointerId>::max(); |
//////////////////////////////////////////////////////////////////////////////// |
// MouseWheelEvent |