| Index: ash/shelf/shelf_widget_unittest.cc
|
| diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc
|
| index dcc7ee66375654931fd19e4575e60ea6371114f5..60830508b7bdc773ca76f8f5cce66d707ac196ad 100644
|
| --- a/ash/shelf/shelf_widget_unittest.cc
|
| +++ b/ash/shelf/shelf_widget_unittest.cc
|
| @@ -209,7 +209,7 @@ TEST_F(ShelfWidgetTest, ShelfEdgeOverlappingWindowHitTestMouse) {
|
| // Create a mouse-event targeting the top of the shelf widget. The
|
| // window-targeter should find |widget| as the target (instead of the
|
| // shelf).
|
| - gfx::Point event_location(widget_bounds.x() + 5, shelf_bounds.y() + 1);
|
| + gfx::PointF event_location(widget_bounds.x() + 5.f, shelf_bounds.y() + 1.f);
|
| ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
|
| ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
|
| ui::EventTarget* target = targeter->FindTargetForEvent(root, &mouse);
|
| @@ -224,7 +224,8 @@ TEST_F(ShelfWidgetTest, ShelfEdgeOverlappingWindowHitTestMouse) {
|
| // Create a mouse-event targeting the right edge of the shelf widget. The
|
| // window-targeter should find |widget| as the target (instead of the
|
| // shelf).
|
| - gfx::Point event_location(shelf_bounds.right() - 1, widget_bounds.y() + 5);
|
| + gfx::PointF event_location(shelf_bounds.right() - 1.f,
|
| + widget_bounds.y() + 5.f);
|
| ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
|
| ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
|
| ui::EventTarget* target = targeter->FindTargetForEvent(root, &mouse);
|
| @@ -249,7 +250,7 @@ TEST_F(ShelfWidgetTest, ShelfEdgeOverlappingWindowHitTestMouse) {
|
| {
|
| // Create a mouse-event targeting the top of the shelf widget. This time,
|
| // window-target should find the shelf as the target.
|
| - gfx::Point event_location(widget_bounds.x() + 5, shelf_bounds.y() + 1);
|
| + gfx::PointF event_location(widget_bounds.x() + 5.f, shelf_bounds.y() + 1.f);
|
| ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_location,
|
| ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
|
| ui::EventTarget* target = targeter->FindTargetForEvent(root, &mouse);
|
| @@ -282,7 +283,7 @@ TEST_F(ShelfWidgetTest, HiddenShelfHitTestTouch) {
|
| // Touch just over the shelf. Since the shelf is visible, the window-targeter
|
| // should not find the shelf as the target.
|
| {
|
| - gfx::Point event_location(20, shelf_bounds.y() - 1);
|
| + gfx::PointF event_location(20.f, shelf_bounds.y() - 1.f);
|
| ui::TouchEvent touch(ui::ET_TOUCH_PRESSED, event_location, 0,
|
| ui::EventTimeForNow());
|
| EXPECT_NE(shelf_widget->GetNativeWindow(),
|
| @@ -300,7 +301,7 @@ TEST_F(ShelfWidgetTest, HiddenShelfHitTestTouch) {
|
| // Touch just over the shelf again. This time, the targeter should find the
|
| // shelf as the target.
|
| {
|
| - gfx::Point event_location(20, shelf_bounds.y() - 1);
|
| + gfx::PointF event_location(20.f, shelf_bounds.y() - 1.f);
|
| ui::TouchEvent touch(ui::ET_TOUCH_PRESSED, event_location, 0,
|
| ui::EventTimeForNow());
|
| EXPECT_EQ(shelf_widget->GetNativeWindow(),
|
|
|