Add PointerDetails to ui::MouseEvent's constructors

ui/views/controls/menu/menu_controller_unittest.cc

 // Copyright 2014 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/controls/menu/menu_controller.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 936 matching lines @@
   IncrementSelection();
   EXPECT_EQ(5, pending_state_item()->GetCommand());
   EXPECT_FALSE(button1->IsHotTracked());
   EXPECT_FALSE(button2->IsHotTracked());
   EXPECT_TRUE(button3->IsHotTracked());
 
   // Move a mouse to hot track the |button1|.
   SubmenuView* sub_menu = menu_item()->GetSubmenu();
   gfx::Point location(button1->GetBoundsInScreen().CenterPoint());
   View::ConvertPointFromScreen(sub_menu->GetScrollViewContainer(), &location);
-  ui::MouseEvent event(ui::ET_MOUSE_MOVED, location, location,
-                       ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent event(
+      ui::ET_MOUSE_MOVED, location, location, ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   ProcessMouseMoved(sub_menu, event);
 
   // Incrementing selection should move hot tracking to the second button (next
   // after the first button).
   IncrementSelection();
   EXPECT_EQ(5, pending_state_item()->GetCommand());
   EXPECT_FALSE(button1->IsHotTracked());
   EXPECT_TRUE(button2->IsHotTracked());
   EXPECT_FALSE(button3->IsHotTracked());
 
@@ skipping 275 matching lines @@
   submenu->ShowAt(owner(), menu_item()->bounds(), false);
   gfx::Point location(submenu->bounds().bottom_right());
   location.Offset(1, 1);
 
   MenuHost* host = GetMenuHost(submenu);
   // Normally created as the full Widget is brought up. Explicitly created here
   // for testing.
   std::unique_ptr<MenuHostRootView> root_view(CreateMenuHostRootView(host));
   DestroyMenuController();
 
-  ui::MouseEvent event(ui::ET_MOUSE_MOVED, location, location,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
+  ui::MouseEvent event(
+      ui::ET_MOUSE_MOVED, location, location, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
 
   // This should not attempt to access the destroyed MenuController and should
   // not crash.
   root_view->OnMouseMoved(event);
 }
 
 // Tets that an asynchronous menu nested within an asynchronous menu closes both
 // menus, and notifies both delegates.
 TEST_F(MenuControllerTest, DoubleAsynchronousNested) {
   MenuController* controller = menu_controller();
@@ skipping 42 matching lines @@
       controller->Run(owner(), nullptr, item, gfx::Rect(), MENU_ANCHOR_TOPLEFT,
                       false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
 
   // Show a sub menu to target with a pointer selection. However have the event
   // occur outside of the bounds of the entire menu.
   SubmenuView* sub_menu = item->GetSubmenu();
   sub_menu->ShowAt(owner(), item->bounds(), false);
   gfx::Point location(sub_menu->bounds().bottom_right());
   location.Offset(1, 1);
-  ui::MouseEvent event(ui::ET_MOUSE_PRESSED, location, location,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
+  ui::MouseEvent event(
+      ui::ET_MOUSE_PRESSED, location, location, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
 
   // When attempting to select outside of all menus this should lead to a
   // shutdown. This should not crash while attempting to repost the event.
   SetSelectionOnPointerDown(sub_menu, &event);
 
   EXPECT_FALSE(IsAsyncRun());
   EXPECT_EQ(delegate, GetCurrentDelegate());
   EXPECT_EQ(0, delegate->on_menu_closed_called());
   EXPECT_EQ(1, nested_delegate->on_menu_closed_called());
   EXPECT_EQ(nullptr, nested_delegate->on_menu_closed_menu());
@@ skipping 78 matching lines @@
       controller->Run(owner(), nullptr, item, gfx::Rect(), MENU_ANCHOR_TOPLEFT,
                       false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
 
   // Show a sub menu to target with a pointer selection. However have the event
   // occur outside of the bounds of the entire menu.
   SubmenuView* sub_menu = item->GetSubmenu();
   sub_menu->ShowAt(owner(), item->bounds(), true);
   gfx::Point location(sub_menu->bounds().bottom_right());
   location.Offset(1, 1);
-  ui::MouseEvent event(ui::ET_MOUSE_PRESSED, location, location,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
+  ui::MouseEvent event(
+      ui::ET_MOUSE_PRESSED, location, location, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
 
   // This will lead to MenuController being deleted during the event repost.
   // The remainder of this test, and TearDown should not crash.
   DestroyMenuControllerOnMenuClosed(nested_delegate.get());
   // When attempting to select outside of all menus this should lead to a
   // shutdown. This should not crash while attempting to repost the event.
   SetSelectionOnPointerDown(sub_menu, &event);
 
   // Close to remove observers before test TearDown
   sub_menu->Close();
@@ skipping 215 matching lines @@
 
   SubmenuView* nested_menu_submenu = nested_menu_item_1->GetSubmenu();
   nested_menu_submenu->SetBounds(0, 0, 100, 100);
   nested_menu_submenu->ShowAt(owner(), gfx::Rect(0, 0, 100, 100), false);
   GetMenuHost(nested_menu_submenu)
       ->SetContentsView(nested_menu_submenu->GetScrollViewContainer());
 
   // Press down outside of the context menu, and within the empty menu item.
   // This should close the first context menu.
   gfx::Point press_location(sub_menu_view->bounds().CenterPoint());
-  ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED, press_location,
-                             press_location, ui::EventTimeForNow(),
-                             ui::EF_RIGHT_MOUSE_BUTTON, 0);
+  ui::MouseEvent press_event(
+      ui::ET_MOUSE_PRESSED, press_location, press_location,
+      ui::EventTimeForNow(), ui::EF_RIGHT_MOUSE_BUTTON, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   ProcessMousePressed(nested_menu_submenu, press_event);
   EXPECT_EQ(nested_controller_delegate_1->on_menu_closed_called(), 1);
   EXPECT_EQ(menu_controller_delegate(), GetCurrentDelegate());
 
   // While the current state is the menu item which launched the sub menu, cause
   // a drag in the empty menu item. This should not hide the menu.
   SetState(sub_menu_item.get());
   press_location.Offset(-5, 0);
-  ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, press_location,
-                            press_location, ui::EventTimeForNow(),
-                            ui::EF_RIGHT_MOUSE_BUTTON, 0);
+  ui::MouseEvent drag_event(
+      ui::ET_MOUSE_DRAGGED, press_location, press_location,
+      ui::EventTimeForNow(), ui::EF_RIGHT_MOUSE_BUTTON, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   ProcessMouseDragged(sub_menu_view, drag_event);
   EXPECT_EQ(menu_delegate()->will_hide_menu_count(), 0);
 
   // Release the mouse in the empty menu item, triggering a context menu
   // request.
-  ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, press_location,
-                               press_location, ui::EventTimeForNow(),
-                               ui::EF_RIGHT_MOUSE_BUTTON, 0);
+  ui::MouseEvent release_event(
+      ui::ET_MOUSE_RELEASED, press_location, press_location,
+      ui::EventTimeForNow(), ui::EF_RIGHT_MOUSE_BUTTON, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   ProcessMouseReleased(sub_menu_view, release_event);
   EXPECT_EQ(sub_menu_item_delegate->show_context_menu_count(), 1);
   EXPECT_EQ(sub_menu_item_delegate->show_context_menu_source(),
             sub_menu_item.get());
 
   // Nest a context menu.
   std::unique_ptr<TestMenuDelegate> nested_menu_delegate_2 =
       base::MakeUnique<TestMenuDelegate>();
   std::unique_ptr<TestMenuItemViewShown> nested_menu_item_2 =
       base::MakeUnique<TestMenuItemViewShown>(nested_menu_delegate_2.get());
@@ skipping 12 matching lines @@
   // crash.
   TestAsyncEscapeKey();
   EXPECT_EQ(nested_controller_delegate_2->on_menu_closed_called(), 1);
   EXPECT_EQ(menu_controller_delegate(), GetCurrentDelegate());
 }
 
 #endif  // defined(USE_AURA)
 
 }  // namespace test
 }  // namespace views