| Index: ui/views/controls/textfield/textfield_unittest.cc
|
| diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc
|
| index 94615c6bff630b42433e84475b208ce757ab22db..77961a16984b7223465b4a99f4e766860376f235 100644
|
| --- a/ui/views/controls/textfield/textfield_unittest.cc
|
| +++ b/ui/views/controls/textfield/textfield_unittest.cc
|
| @@ -819,7 +819,7 @@ TEST_F(TextfieldTest, DragAndDrop_InitiateDrag) {
|
| ui::OSExchangeData data;
|
| const gfx::Range kStringRange(6, 12);
|
| textfield_->SelectRange(kStringRange);
|
| - const gfx::Point kStringPoint(GetCursorPositionX(9), 0);
|
| + const gfx::PointF kStringPoint(GetCursorPositionX(9), 0);
|
| textfield_->WriteDragDataForView(NULL, kStringPoint, &data);
|
| EXPECT_TRUE(data.GetString(&string));
|
| EXPECT_EQ(textfield_->GetSelectedText(), string);
|
| @@ -846,12 +846,12 @@ TEST_F(TextfieldTest, DragAndDrop_InitiateDrag) {
|
| textfield_->OnMousePressed(press_event);
|
| EXPECT_EQ(ui::DragDropTypes::DRAG_NONE,
|
| textfield_->GetDragOperationsForView(NULL, gfx::Point()));
|
| - EXPECT_FALSE(textfield_->CanStartDragForView(NULL, gfx::Point(),
|
| - gfx::Point()));
|
| + EXPECT_FALSE(
|
| + textfield_->CanStartDragForView(NULL, gfx::PointF(), gfx::PointF()));
|
| EXPECT_EQ(ui::DragDropTypes::DRAG_COPY,
|
| textfield_->GetDragOperationsForView(NULL, kStringPoint));
|
| - EXPECT_TRUE(textfield_->CanStartDragForView(NULL, kStringPoint,
|
| - gfx::Point()));
|
| + EXPECT_TRUE(
|
| + textfield_->CanStartDragForView(NULL, kStringPoint, gfx::PointF()));
|
| // Ensure that textfields support local moves.
|
| EXPECT_EQ(ui::DragDropTypes::DRAG_MOVE | ui::DragDropTypes::DRAG_COPY,
|
| textfield_->GetDragOperationsForView(textfield_, kStringPoint));
|
| @@ -873,8 +873,8 @@ TEST_F(TextfieldTest, DragAndDrop_ToTheRight) {
|
| ui::MouseEvent click_a(ui::ET_MOUSE_PRESSED, point, point,
|
| ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
|
| textfield_->OnMousePressed(click_a);
|
| - EXPECT_TRUE(textfield_->CanStartDragForView(textfield_, click_a.location(),
|
| - gfx::Point()));
|
| + EXPECT_TRUE(textfield_->CanStartDragForView(
|
| + textfield_, click_a.location(), gfx::PointF()));
|
| operations = textfield_->GetDragOperationsForView(textfield_,
|
| click_a.location());
|
| EXPECT_EQ(ui::DragDropTypes::DRAG_MOVE | ui::DragDropTypes::DRAG_COPY,
|
| @@ -926,8 +926,8 @@ TEST_F(TextfieldTest, DragAndDrop_ToTheLeft) {
|
| ui::MouseEvent click_a(ui::ET_MOUSE_PRESSED, point, point,
|
| ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
|
| textfield_->OnMousePressed(click_a);
|
| - EXPECT_TRUE(textfield_->CanStartDragForView(textfield_, click_a.location(),
|
| - gfx::Point()));
|
| + EXPECT_TRUE(textfield_->CanStartDragForView(
|
| + textfield_, click_a.location(), gfx::PointF()));
|
| operations = textfield_->GetDragOperationsForView(textfield_,
|
| click_a.location());
|
| EXPECT_EQ(ui::DragDropTypes::DRAG_MOVE | ui::DragDropTypes::DRAG_COPY,
|
| @@ -1964,7 +1964,7 @@ TEST_F(TextfieldTest, TestLongPressInitiatesDragDrop) {
|
|
|
| // Ensure the textfield will provide selected text for drag data.
|
| textfield_->SelectRange(gfx::Range(6, 12));
|
| - const gfx::Point kStringPoint(GetCursorPositionX(9), 0);
|
| + const gfx::PointF kStringPoint(GetCursorPositionX(9), 0);
|
|
|
| // Enable touch-drag-drop to make long press effective.
|
| CommandLine::ForCurrentProcess()->AppendSwitch(
|
|
|