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

ui/views/widget/desktop_aura/desktop_native_widget_aura_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/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/window_tree_client.h"
@@ skipping 433 matching lines @@
 
 // The following code verifies we can correctly destroy a Widget from a mouse
 // enter/exit. We could test move/drag/enter/exit but in general we don't run
 // nested message loops from such events, nor has the code ever really dealt
 // with this situation.
 
 // Generates two moves (first generates enter, second real move), a press, drag
 // and release stopping at |last_event_type|.
 void GenerateMouseEvents(Widget* widget, ui::EventType last_event_type) {
   const gfx::Rect screen_bounds(widget->GetWindowBoundsInScreen());
-  ui::MouseEvent move_event(ui::ET_MOUSE_MOVED, screen_bounds.CenterPoint(),
-                            screen_bounds.CenterPoint(), ui::EventTimeForNow(),
-                            0, 0);
+  ui::MouseEvent move_event(
+      ui::ET_MOUSE_MOVED, screen_bounds.CenterPoint(),
+      screen_bounds.CenterPoint(), ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   ui::EventProcessor* dispatcher = WidgetTest::GetEventProcessor(widget);
   ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move_event);
   if (last_event_type == ui::ET_MOUSE_ENTERED || details.dispatcher_destroyed)
     return;
   details = dispatcher->OnEventFromSource(&move_event);
   if (last_event_type == ui::ET_MOUSE_MOVED || details.dispatcher_destroyed)
     return;
 
-  ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED, screen_bounds.CenterPoint(),
-                             screen_bounds.CenterPoint(), ui::EventTimeForNow(),
-                             0, 0);
+  ui::MouseEvent press_event(
+      ui::ET_MOUSE_PRESSED, screen_bounds.CenterPoint(),
+      screen_bounds.CenterPoint(), ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   details = dispatcher->OnEventFromSource(&press_event);
   if (last_event_type == ui::ET_MOUSE_PRESSED || details.dispatcher_destroyed)
     return;
 
   gfx::Point end_point(screen_bounds.CenterPoint());
   end_point.Offset(1, 1);
-  ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, end_point, end_point,
-                            ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent drag_event(
+      ui::ET_MOUSE_DRAGGED, end_point, end_point, ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   details = dispatcher->OnEventFromSource(&drag_event);
   if (last_event_type == ui::ET_MOUSE_DRAGGED || details.dispatcher_destroyed)
     return;
 
-  ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, end_point, end_point,
-                               ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent release_event(
+      ui::ET_MOUSE_RELEASED, end_point, end_point, ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   details = dispatcher->OnEventFromSource(&release_event);
   if (details.dispatcher_destroyed)
     return;
 }
 
 // Creates a widget and invokes GenerateMouseEvents() with |last_event_type|.
 void RunCloseWidgetDuringDispatchTest(WidgetTest* test,
                                       ui::EventType last_event_type) {
   // |widget| is deleted by CloseWidgetView.
   Widget* widget = new Widget;
@@ skipping 46 matching lines @@
   top_level_widget.Init(init_params);
   top_level_widget.Show();
   EXPECT_TRUE(top_level_widget.IsVisible());
 
   // Create a view and validate that a mouse moves makes it to the view.
   EventCountView* widget_view = new EventCountView();
   widget_view->SetBounds(0, 0, 10, 10);
   top_level_widget.GetRootView()->AddChildView(widget_view);
 
   gfx::Point cursor_location_main(5, 5);
-  ui::MouseEvent move_main(ui::ET_MOUSE_MOVED, cursor_location_main,
-                           cursor_location_main, ui::EventTimeForNow(),
-                           ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent move_main(
+      ui::ET_MOUSE_MOVED, cursor_location_main, cursor_location_main,
+      ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   ui::EventDispatchDetails details =
       GetEventProcessor(&top_level_widget)->OnEventFromSource(&move_main);
   ASSERT_FALSE(details.dispatcher_destroyed);
 
   EXPECT_EQ(1, widget_view->GetEventCount(ui::ET_MOUSE_ENTERED));
   widget_view->ResetCounts();
 
   // Create a modal dialog and validate that a mouse down message makes it to
   // the main view within the dialog.
 
   // This instance will be destroyed when the dialog is destroyed.
   ModalDialogDelegate* dialog_delegate = new ModalDialogDelegate;
 
   Widget* modal_dialog_widget = views::DialogDelegate::CreateDialogWidget(
       dialog_delegate, NULL, top_level_widget.GetNativeView());
   modal_dialog_widget->SetBounds(gfx::Rect(100, 100, 200, 200));
   EventCountView* dialog_widget_view = new EventCountView();
   dialog_widget_view->SetBounds(0, 0, 50, 50);
   modal_dialog_widget->GetRootView()->AddChildView(dialog_widget_view);
   modal_dialog_widget->Show();
   EXPECT_TRUE(modal_dialog_widget->IsVisible());
 
   gfx::Point cursor_location_dialog(100, 100);
   ui::MouseEvent mouse_down_dialog(
       ui::ET_MOUSE_PRESSED, cursor_location_dialog, cursor_location_dialog,
-      ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+      ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   details = GetEventProcessor(&top_level_widget)->OnEventFromSource(
       &mouse_down_dialog);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(1, dialog_widget_view->GetEventCount(ui::ET_MOUSE_PRESSED));
 
   // Send a mouse move message to the main window. It should not be received by
   // the main window as the modal dialog is still active.
   gfx::Point cursor_location_main2(6, 6);
-  ui::MouseEvent mouse_down_main(ui::ET_MOUSE_MOVED, cursor_location_main2,
-                                 cursor_location_main2, ui::EventTimeForNow(),
-                                 ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent mouse_down_main(
+      ui::ET_MOUSE_MOVED, cursor_location_main2, cursor_location_main2,
+      ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   details = GetEventProcessor(&top_level_widget)->OnEventFromSource(
       &mouse_down_main);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(0, widget_view->GetEventCount(ui::ET_MOUSE_MOVED));
 
   modal_dialog_widget->CloseNow();
   top_level_widget.CloseNow();
 }
 
 #if defined(OS_WIN)
@@ skipping 29 matching lines @@
       reinterpret_cast<WPARAM>(win32_window),
       MAKELPARAM(WM_LBUTTONDOWN, HTCLIENT));
   EXPECT_EQ(activate_result, MA_ACTIVATE);
 
   modal_dialog_widget->CloseNow();
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace test
 }  // namespace views