ash/wm/workspace_controller_unittest.cc - Issue 1260453006: ui: events: Add a class to hold common touch and stylus properties

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/workspace_controller_unittest.cc

Issue 1260453006: ui: events: Add a class to hold common touch and stylus properties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address build problems, add accessor and unit tests. Created 5 years, 4 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/workspace/workspace_event_handler_unittest.cc ('k') | chrome/browser/chromeos/events/event_rewriter_unittest.cc » ('j') | ui/events/event.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/workspace_controller_unittest.cc

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

index 3739158577a6a31a7d5e5282f277b6136d93cacf..a4d5575cfe2a8c27f3a2b6d3224a03626045ea1d 100644

--- a/ash/wm/workspace_controller_unittest.cc

+++ b/ash/wm/workspace_controller_unittest.cc

@@ -1478,8 +1478,10 @@ TEST_F(WorkspaceControllerTest, WindowEdgeHitTest) {

for (int i = 0; i < kNumPoints; ++i) {

SCOPED_TRACE(points[i].direction);

const gfx::Point& location = points[i].location;

- ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, location, location,

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

+ ui::MouseEvent mouse(

+ ui::ET_MOUSE_MOVED, location, location, ui::EventTimeForNow(),

+ ui::EF_NONE, ui::EF_NONE,

+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));

ui::EventTarget* target = targeter->FindTargetForEvent(root, &mouse);

EXPECT_EQ(expected_target, target);

@@ -1519,8 +1521,10 @@ TEST_F(WorkspaceControllerTest, WindowEdgeMouseHitTestPanel) {

for (int i = 0; i < kNumPoints; ++i) {

SCOPED_TRACE(points[i].direction);

const gfx::Point& location = points[i].location;

- ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, location, location,

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

+ ui::MouseEvent mouse(

+ ui::ET_MOUSE_MOVED, location, location, ui::EventTimeForNow(),

+ ui::EF_NONE, ui::EF_NONE,

+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));

ui::EventTarget* target = targeter->FindTargetForEvent(root, &mouse);

if (points[i].is_target_hit)

EXPECT_EQ(window.get(), target);

@@ -1596,8 +1600,10 @@ TEST_F(WorkspaceControllerTest, WindowEdgeHitTestDocked) {

for (int i = 0; i < kNumPoints; ++i) {

SCOPED_TRACE(points[i].direction);

const gfx::Point& location = points[i].location;

- ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, location, location,

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

+ ui::MouseEvent mouse(

+ ui::ET_MOUSE_MOVED, location, location, ui::EventTimeForNow(),

+ ui::EF_NONE, ui::EF_NONE,

+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));

ui::EventTarget* target = targeter->FindTargetForEvent(root, &mouse);

if (points[i].is_target_hit)

EXPECT_EQ(window.get(), target);

« no previous file with comments | « ash/wm/workspace/workspace_event_handler_unittest.cc ('k') | chrome/browser/chromeos/events/event_rewriter_unittest.cc » ('j') | ui/events/event.h » ('J')