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

ui/views/widget/root_view_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 "ui/views/widget/root_view.h"
 
 #include "ui/events/event_utils.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view_targeter.h"
@@ skipping 373 matching lines @@
   bool view_destroyed = false;
   View* child = new DeleteViewOnEvent(ui::ET_MOUSE_EXITED, &view_destroyed);
   content->AddChildView(child);
   child->SetBounds(10, 10, 500, 500);
 
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget.GetRootView());
 
   // Generate a mouse move event which ensures that the mouse_moved_handler_
   // member is set in the RootView class.
-  ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::Point(15, 15),
-                             gfx::Point(15, 15), ui::EventTimeForNow(), 0,
-                             0);
+  ui::MouseEvent moved_event(
+      ui::ET_MOUSE_MOVED, gfx::Point(15, 15), gfx::Point(15, 15),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(moved_event);
   ASSERT_FALSE(view_destroyed);
 
   // Generate a mouse exit event which in turn will delete the child view which
   // was the target of the mouse move event above. This should not crash when
   // the mouse exit handler returns from the child.
-  ui::MouseEvent exit_event(ui::ET_MOUSE_EXITED, gfx::Point(), gfx::Point(),
-                            ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent exit_event(
+      ui::ET_MOUSE_EXITED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(), 0,
+      0, ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseExited(exit_event);
 
   EXPECT_TRUE(view_destroyed);
   EXPECT_FALSE(content->has_children());
 }
 
 // Verifies deleting a View in OnMouseEntered() doesn't crash.
 TEST_F(RootViewTest, DeleteViewOnMouseEnterDispatch) {
   Widget widget;
   Widget::InitParams init_params =
       CreateParams(Widget::InitParams::TYPE_POPUP);
   init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget.Init(init_params);
   widget.SetBounds(gfx::Rect(10, 10, 500, 500));
 
   View* content = new View;
   widget.SetContentsView(content);
 
   bool view_destroyed = false;
   View* child = new DeleteViewOnEvent(ui::ET_MOUSE_ENTERED, &view_destroyed);
   content->AddChildView(child);
 
   // Make |child| smaller than the containing Widget and RootView.
   child->SetBounds(100, 100, 100, 100);
 
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget.GetRootView());
 
   // Move the mouse within |widget| but outside of |child|.
-  ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::Point(15, 15),
-                             gfx::Point(15, 15), ui::EventTimeForNow(), 0,
-                             0);
+  ui::MouseEvent moved_event(
+      ui::ET_MOUSE_MOVED, gfx::Point(15, 15), gfx::Point(15, 15),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(moved_event);
   ASSERT_FALSE(view_destroyed);
 
   // Move the mouse within |child|, which should dispatch a mouse enter event to
   // |child| and destroy the view. This should not crash when the mouse enter
   // handler returns from the child.
-  ui::MouseEvent moved_event2(ui::ET_MOUSE_MOVED, gfx::Point(115, 115),
-                              gfx::Point(115, 115), ui::EventTimeForNow(), 0,
-                              0);
+  ui::MouseEvent moved_event2(
+      ui::ET_MOUSE_MOVED, gfx::Point(115, 115), gfx::Point(115, 115),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(moved_event2);
 
   EXPECT_TRUE(view_destroyed);
   EXPECT_FALSE(content->has_children());
 }
 
 namespace {
 
 // View class which deletes its owning Widget when it gets a mouse exit event.
 class DeleteWidgetOnMouseExit : public View {
@@ skipping 32 matching lines @@
   content->AddChildView(child);
   widget->SetContentsView(content);
 
   // Make |child| smaller than the containing Widget and RootView.
   child->SetBounds(100, 100, 100, 100);
 
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget->GetRootView());
 
   // Move the mouse within |child|.
-  ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::Point(115, 115),
-                             gfx::Point(115, 115), ui::EventTimeForNow(), 0,
-                             0);
+  ui::MouseEvent moved_event(
+      ui::ET_MOUSE_MOVED, gfx::Point(115, 115), gfx::Point(115, 115),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(moved_event);
   ASSERT_TRUE(widget_deletion_observer.IsWidgetAlive());
 
   // Move the mouse outside of |child| which should dispatch a mouse exit event
   // to |child| and destroy the widget. This should not crash when the mouse
   // exit handler returns from the child.
-  ui::MouseEvent move_event2(ui::ET_MOUSE_MOVED, gfx::Point(15, 15),
-                             gfx::Point(15, 15), ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent move_event2(
+      ui::ET_MOUSE_MOVED, gfx::Point(15, 15), gfx::Point(15, 15),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(move_event2);
   EXPECT_FALSE(widget_deletion_observer.IsWidgetAlive());
 }
 
 // Test that there is no crash if a View deletes its parent widget as a result
 // of a mouse exited event which was propagated from one of its children.
 TEST_F(RootViewTest, DeleteWidgetOnMouseExitDispatchFromChild) {
   Widget* widget = new Widget;
   Widget::InitParams init_params =
       CreateParams(Widget::InitParams::TYPE_POPUP);
@@ skipping 14 matching lines @@
   child->SetBounds(100, 100, 100, 100);
   subchild->SetBounds(0, 0, 100, 100);
 
   // Make mouse enter and exit events get propagated from |subchild| to |child|.
   child->set_notify_enter_exit_on_child(true);
 
   internal::RootView* root_view =
       static_cast<internal::RootView*>(widget->GetRootView());
 
   // Move the mouse within |subchild| and |child|.
-  ui::MouseEvent moved_event(ui::ET_MOUSE_MOVED, gfx::Point(115, 115),
-                             gfx::Point(115, 115), ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent moved_event(
+      ui::ET_MOUSE_MOVED, gfx::Point(115, 115), gfx::Point(115, 115),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(moved_event);
   ASSERT_TRUE(widget_deletion_observer.IsWidgetAlive());
 
   // Move the mouse outside of |subchild| and |child| which should dispatch a
   // mouse exit event to |subchild| and destroy the widget. This should not
   // crash when the mouse exit handler returns from |subchild|.
-  ui::MouseEvent move_event2(ui::ET_MOUSE_MOVED, gfx::Point(15, 15),
-                             gfx::Point(15, 15), ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent move_event2(
+      ui::ET_MOUSE_MOVED, gfx::Point(15, 15), gfx::Point(15, 15),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(move_event2);
   EXPECT_FALSE(widget_deletion_observer.IsWidgetAlive());
 }
 
 }  // namespace test
 }  // namespace views