Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1485)

Unified Diff: ui/views/bubble/bubble_window_targeter_unittest.cc

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-gfx: . Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/bubble/bubble_window_targeter_unittest.cc
diff --git a/ui/views/bubble/bubble_window_targeter_unittest.cc b/ui/views/bubble/bubble_window_targeter_unittest.cc
index 103cc3d283199a9b267a3ee10c11b2a80f4a9e4e..943febca1736a2c27367c62108b5bec6511e2135 100644
--- a/ui/views/bubble/bubble_window_targeter_unittest.cc
+++ b/ui/views/bubble/bubble_window_targeter_unittest.cc
@@ -89,7 +89,7 @@ TEST_F(BubbleWindowTargeterTest, HitTest) {
ui::EventTarget* root = bubble_widget()->GetNativeWindow()->GetRootWindow();
ui::EventTargeter* targeter = root->GetEventTargeter();
aura::Window* bubble_window = bubble_widget()->GetNativeWindow();
- gfx::Rect bubble_bounds = bubble_window->GetBoundsInRootWindow();
+ auto bubble_bounds = gfx::RectF(bubble_window->GetBoundsInRootWindow());
{
bubble_delegate()->set_margins(gfx::Insets());
@@ -110,9 +110,10 @@ TEST_F(BubbleWindowTargeterTest, HitTest) {
new BubbleWindowTargeter(bubble_delegate())));
{
bubble_delegate()->set_margins(gfx::Insets(20, 20, 20, 20));
- ui::MouseEvent move1(ui::ET_MOUSE_MOVED, bubble_bounds.origin(),
- bubble_bounds.origin(), ui::EventTimeForNow(),
- ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent move1(ui::ET_MOUSE_MOVED,
+ gfx::PointF(bubble_bounds.origin()),
+ gfx::PointF(bubble_bounds.origin()),
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
EXPECT_NE(bubble_window, targeter->FindTargetForEvent(root, &move1));
}
}

Powered by Google App Engine
This is Rietveld 408576698