ui: events: Add a class to hold common touch and stylus properties

ash/shelf/shelf_tooltip_manager_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/shelf_tooltip_manager.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ skipping 213 matching lines @@
   ShowImmediately();
   ASSERT_TRUE(TooltipIsVisible());
 
   aura::Window* root_window = Shell::GetInstance()->GetPrimaryRootWindow();
   ui::EventHandler* event_handler = GetEventHandler();
 
   gfx::Rect tooltip_rect = GetTooltipWidget()->GetNativeWindow()->bounds();
   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);
   event_handler->OnMouseEvent(&mouse_event);
   EXPECT_FALSE(mouse_event.handled());
   EXPECT_TRUE(TooltipIsVisible());
 
   // Should hide if the mouse is out of the tooltip.
   test_api.set_location(tooltip_rect.origin() + gfx::Vector2d(-1, -1));
   event_handler->OnMouseEvent(&mouse_event);
   EXPECT_FALSE(mouse_event.handled());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(TooltipIsVisible());
 }
 
 // Checks that tooltip is hidden when mouse is pressed in anywhere.
 TEST_F(ShelfTooltipManagerTest, HideForMouseClickEvent) {
   ShowImmediately();
   ASSERT_TRUE(TooltipIsVisible());
 
   aura::Window* root_window = Shell::GetInstance()->GetPrimaryRootWindow();
   ui::EventHandler* event_handler = GetEventHandler();
 
   gfx::Rect tooltip_rect = GetTooltipWidget()->GetNativeWindow()->bounds();
   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);
   EXPECT_FALSE(mouse_event.handled());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(TooltipIsVisible());
 
   // Should hide if the mouse is pressed outside of the tooltip.
   ShowImmediately();
   ASSERT_TRUE(TooltipIsVisible());
 
   ui::LocatedEventTestApi test_api(&mouse_event);
   test_api.set_location(tooltip_rect.origin() + gfx::Vector2d(-1, -1));
 
   SetEventTarget(root_window, &mouse_event);
   event_handler->OnMouseEvent(&mouse_event);
   EXPECT_FALSE(mouse_event.handled());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(TooltipIsVisible());
 }
 
 }  // namespace test
 }  // namespace ash