gfx: Make conversions from gfx::Point to PointF explicit.

ash/shelf/shelf_view_unittest.cc

 // Copyright (c) 2012 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 "ash/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
@@ skipping 425 matching lines @@
         EXPECT_LE(item_bounds.right(), shelf_view_bounds.width());
         EXPECT_LE(item_bounds.bottom(), shelf_view_bounds.height());
       }
     }
   }
 
   ShelfButton* SimulateButtonPressed(ShelfButtonHost::Pointer pointer,
                                      int button_index) {
     ShelfButtonHost* button_host = shelf_view_;
     ShelfButton* button = test_api_->GetButton(button_index);
-    ui::MouseEvent click_event(ui::ET_MOUSE_PRESSED, gfx::Point(),
-                               button->GetBoundsInScreen().origin(),
-                               ui::EventTimeForNow(), 0, 0);
+    ui::MouseEvent click_event(
+        ui::ET_MOUSE_PRESSED, gfx::PointF(),
+        gfx::PointF(button->GetBoundsInScreen().origin()),
+        ui::EventTimeForNow(), 0, 0);
     button_host->PointerPressedOnButton(button, pointer, click_event);
     return button;
   }
 
   // Simulates a single mouse click.
   void SimulateClick(int button_index) {
     ShelfButtonHost* button_host = shelf_view_;
     ShelfButton* button =
         SimulateButtonPressed(ShelfButtonHost::MOUSE, button_index);
-    ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, gfx::Point(),
-                                 button->GetBoundsInScreen().origin(),
-                                 ui::EventTimeForNow(), 0, 0);
+    ui::MouseEvent release_event(
+        ui::ET_MOUSE_RELEASED, gfx::PointF(),
+        gfx::PointF(button->GetBoundsInScreen().origin()),
+        ui::EventTimeForNow(), 0, 0);
     test_api_->ButtonPressed(button, release_event);
     button_host->PointerReleasedOnButton(button, ShelfButtonHost::MOUSE, false);
   }
 
   // Simulates the second click of a double click.
   void SimulateDoubleClick(int button_index) {
     ShelfButtonHost* button_host = shelf_view_;
     ShelfButton* button =
         SimulateButtonPressed(ShelfButtonHost::MOUSE, button_index);
-    ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, gfx::Point(),
-                                 button->GetBoundsInScreen().origin(),
-                                 ui::EventTimeForNow(), ui::EF_IS_DOUBLE_CLICK,
-                                 0);
+    ui::MouseEvent release_event(
+        ui::ET_MOUSE_RELEASED, gfx::PointF(),
+        gfx::PointF(button->GetBoundsInScreen().origin()),
+        ui::EventTimeForNow(), ui::EF_IS_DOUBLE_CLICK, 0);
     test_api_->ButtonPressed(button, release_event);
     button_host->PointerReleasedOnButton(button, ShelfButtonHost::MOUSE, false);
   }
 
   views::View* SimulateDrag(ShelfButtonHost::Pointer pointer,
                             int button_index,
                             int destination_index) {
     ShelfButtonHost* button_host = shelf_view_;
     views::View* button = SimulateButtonPressed(pointer, button_index);
 
     // Drag.
     views::View* destination = test_api_->GetButton(destination_index);
     ui::MouseEvent drag_event(
-        ui::ET_MOUSE_DRAGGED, gfx::Point(destination->x() - button->x(),
-                                         destination->y() - button->y()),
-        destination->GetBoundsInScreen().origin(), ui::EventTimeForNow(), 0, 0);
+        ui::ET_MOUSE_DRAGGED, gfx::PointF(destination->x() - button->x(),
+                                          destination->y() - button->y()),
+        gfx::PointF(destination->GetBoundsInScreen().origin()),
+        ui::EventTimeForNow(), 0, 0);
     button_host->PointerDraggedOnButton(button, pointer, drag_event);
     return button;
   }
 
   void SetupForDragTest(
       std::vector<std::pair<ShelfID, views::View*> >* id_map) {
     // Initialize |id_map| with the automatically-created shelf buttons.
     for (size_t i = 0; i < model_->items().size(); ++i) {
       ShelfButton* button = test_api_->GetButton(i);
       id_map->push_back(std::make_pair(model_->items()[i].id, button));
@@ skipping 682 matching lines @@
   ShelfID shelf_id = (id_map.begin() + 1)->first;
   views::View* button = (id_map.begin() + 1)->second;
 
   // Replace the ShelfItemDelegate for |shelf_id| with one which tracks whether
   // the shelf item gets selected.
   ShelfItemSelectionTracker* selection_tracker = new ShelfItemSelectionTracker;
   item_manager_->SetShelfItemDelegate(
       shelf_id,
       scoped_ptr<ShelfItemDelegate>(selection_tracker).Pass());
 
-  gfx::Vector2d press_offset(5, 30);
-  gfx::Point press_location = gfx::Point() + press_offset;
-  gfx::Point press_location_in_screen =
-      button->GetBoundsInScreen().origin() + press_offset;
+  gfx::Vector2dF press_offset(5.f, 30.f);
+  gfx::PointF press_location = gfx::PointF() + press_offset;
+  gfx::PointF press_location_in_screen =
+      gfx::PointF(button->GetBoundsInScreen().origin()) + press_offset;
 
   ui::MouseEvent click_event(ui::ET_MOUSE_PRESSED, press_location,
                              press_location_in_screen, ui::EventTimeForNow(),
                              ui::EF_LEFT_MOUSE_BUTTON, 0);
   button->OnMousePressed(click_event);
 
   ui::MouseEvent drag_event1(
       ui::ET_MOUSE_DRAGGED, press_location + gfx::Vector2d(0, 1),
-      press_location_in_screen + gfx::Vector2d(0, 1), ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, 0);
+      press_location_in_screen + gfx::Vector2dF(0.f, 1.f),
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
   button->OnMouseDragged(drag_event1);
 
   ui::MouseEvent drag_event2(
       ui::ET_MOUSE_DRAGGED, press_location + gfx::Vector2d(-1, 0),
-      press_location_in_screen + gfx::Vector2d(-1, 0), ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, 0);
+      press_location_in_screen + gfx::Vector2dF(-1.f, 0.f),
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
   button->OnMouseDragged(drag_event2);
 
   ui::MouseEvent release_event(
       ui::ET_MOUSE_RELEASED, press_location + gfx::Vector2d(-1, 0),
-      press_location_in_screen + gfx::Vector2d(-1, 0), ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, 0);
+      press_location_in_screen + gfx::Vector2dF(-1.f, 0.f),
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
   button->OnMouseReleased(release_event);
 
   EXPECT_TRUE(selection_tracker->WasSelected());
 }
 
 // Confirm that item status changes are reflected in the buttons.
 TEST_F(ShelfViewTest, ShelfItemStatus) {
   // All buttons should be visible.
   ASSERT_EQ(test_api_->GetButtonCount(),
             test_api_->GetLastVisibleIndex() + 1);
@@ skipping 657 matching lines @@
   test_api_->RunMessageLoopUntilAnimationsDone();
   CheckAllItemsAreInBounds();
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, ShelfViewTextDirectionTest, testing::Bool());
 INSTANTIATE_TEST_CASE_P(VisibleBounds, ShelfViewVisibleBoundsTest,
     testing::Bool());
 
 }  // namespace test
 }  // namespace ash