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

Unified Diff: ash/shelf/shelf_tooltip_manager_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: ash/shelf/shelf_tooltip_manager_unittest.cc
diff --git a/ash/shelf/shelf_tooltip_manager_unittest.cc b/ash/shelf/shelf_tooltip_manager_unittest.cc
index 6ebb063ec48221ad0406f0cd7ea304eb0c3bfee0..74c875ef3fab6c112931893b1afaefc28836eae5 100644
--- a/ash/shelf/shelf_tooltip_manager_unittest.cc
+++ b/ash/shelf/shelf_tooltip_manager_unittest.cc
@@ -231,9 +231,11 @@ TEST_F(ShelfTooltipManagerTest, HideForMouseMoveEvent) {
ASSERT_FALSE(tooltip_rect.IsEmpty());
// Shouldn't hide if the mouse is in the tooltip.
- ui::MouseEvent mouse_event(ui::ET_MOUSE_MOVED, tooltip_rect.CenterPoint(),
- tooltip_rect.CenterPoint(), ui::EventTimeForNow(),
- ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent mouse_event(
+ ui::ET_MOUSE_MOVED, tooltip_rect.CenterPoint(),
+ tooltip_rect.CenterPoint(), ui::EventTimeForNow(), ui::EF_NONE,
+ ui::EF_NONE,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
ui::LocatedEventTestApi test_api(&mouse_event);
SetEventTarget(root_window, &mouse_event);
@@ -261,9 +263,11 @@ TEST_F(ShelfTooltipManagerTest, HideForMouseClickEvent) {
ASSERT_FALSE(tooltip_rect.IsEmpty());
// Should hide if the mouse is pressed in the tooltip.
- ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, tooltip_rect.CenterPoint(),
- tooltip_rect.CenterPoint(), ui::EventTimeForNow(),
- ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent mouse_event(
+ ui::ET_MOUSE_PRESSED, tooltip_rect.CenterPoint(),
+ tooltip_rect.CenterPoint(), ui::EventTimeForNow(), ui::EF_NONE,
+ ui::EF_NONE,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
SetEventTarget(root_window, &mouse_event);
event_handler->OnMouseEvent(&mouse_event);

Powered by Google App Engine
This is Rietveld 408576698