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

Unified Diff: ui/app_list/views/app_list_main_view_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
Index: ui/app_list/views/app_list_main_view_unittest.cc
diff --git a/ui/app_list/views/app_list_main_view_unittest.cc b/ui/app_list/views/app_list_main_view_unittest.cc
index aaae0b90ff8137262daeab13ff5709cba174ae16..8b5fc4c945da7802e5c4d23bfc8837c0e335096f 100644
--- a/ui/app_list/views/app_list_main_view_unittest.cc
+++ b/ui/app_list/views/app_list_main_view_unittest.cc
@@ -130,10 +130,12 @@ class AppListMainViewTest : public views::ViewsTestBase {
gfx::Point center = view->GetLocalBounds().CenterPoint();
view->OnMousePressed(ui::MouseEvent(
ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+ ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
view->OnMouseReleased(ui::MouseEvent(
ui::ET_MOUSE_RELEASED, center, center, ui::EventTimeForNow(),
- ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+ ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
}
// |point| is in |grid_view|'s coordinates.
@@ -145,8 +147,9 @@ class AppListMainViewTest : public views::ViewsTestBase {
gfx::Point translated =
gfx::PointAtOffsetFromOrigin(point - view->bounds().origin());
- ui::MouseEvent pressed_event(ui::ET_MOUSE_PRESSED, translated, point,
- ui::EventTimeForNow(), 0, 0);
+ ui::MouseEvent pressed_event(
+ ui::ET_MOUSE_PRESSED, translated, point, ui::EventTimeForNow(), 0, 0,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
grid_view->InitiateDrag(view, pointer, pressed_event);
return view;
}
@@ -159,8 +162,9 @@ class AppListMainViewTest : public views::ViewsTestBase {
DCHECK(drag_view);
gfx::Point translated =
gfx::PointAtOffsetFromOrigin(point - drag_view->bounds().origin());
- ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, translated, point,
- ui::EventTimeForNow(), 0, 0);
+ ui::MouseEvent drag_event(
+ ui::ET_MOUSE_DRAGGED, translated, point, ui::EventTimeForNow(), 0, 0,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
grid_view->UpdateDragFromItem(pointer, drag_event);
}

Powered by Google App Engine
This is Rietveld 408576698