ash/wm/immersive_fullscreen_controller_unittest.cc - Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/immersive_fullscreen_controller_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

« no previous file with comments | « ash/wm/gestures/overview_gesture_handler_unittest.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | cc/layers/delegated_renderer_layer_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/immersive_fullscreen_controller_unittest.cc

diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc

index 3cae3173902bbb734186d8e43e91ace3e6d5ccdb..ca06f65a81b3234440a116466511f52ad1ab5abf 100644

--- a/ash/wm/immersive_fullscreen_controller_unittest.cc

+++ b/ash/wm/immersive_fullscreen_controller_unittest.cc

@@ -356,8 +356,9 @@ TEST_F(ImmersiveFullscreenControllerTest, OnMouseEvent) {

top_container_bounds_in_screen.y());

// Mouse wheel event does nothing.

- ui::MouseEvent wheel(ui::ET_MOUSEWHEEL, top_edge_pos, top_edge_pos,

- ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);

+ ui::MouseEvent wheel(ui::ET_MOUSEWHEEL, gfx::PointF(top_edge_pos),

+ gfx::PointF(top_edge_pos), ui::EventTimeForNow(),

+ ui::EF_NONE, ui::EF_NONE);

event_generator.Dispatch(&wheel);

EXPECT_FALSE(top_edge_hover_timer_running());

@@ -755,7 +756,7 @@ TEST_F(ImmersiveFullscreenControllerTest, EventsDoNotLeakToWindowUnderneath) {

EXPECT_EQ(behind->GetBoundsInScreen().y(), window()->GetBoundsInScreen().y());

int top = behind->GetBoundsInScreen().y();

- ui::TouchEvent touch(ui::ET_TOUCH_MOVED, gfx::Point(10, top), 0,

+ ui::TouchEvent touch(ui::ET_TOUCH_MOVED, gfx::PointF(10.f, top), 0,

ui::EventTimeForNow());

ui::EventTarget* root = window()->GetRootWindow();

ui::EventTargeter* targeter = root->GetEventTargeter();

@@ -766,7 +767,7 @@ TEST_F(ImmersiveFullscreenControllerTest, EventsDoNotLeakToWindowUnderneath) {

// Make sure the windows are still aligned on top.

EXPECT_EQ(behind->GetBoundsInScreen().y(), window()->GetBoundsInScreen().y());

top = behind->GetBoundsInScreen().y();

- ui::TouchEvent touch2(ui::ET_TOUCH_MOVED, gfx::Point(10, top), 0,

+ ui::TouchEvent touch2(ui::ET_TOUCH_MOVED, gfx::PointF(10.f, top), 0,

ui::EventTimeForNow());

// The event should still be targeted to window().

EXPECT_EQ(window(), targeter->FindTargetForEvent(root, &touch2));