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

ui/views/controls/menu/menu_controller.cc

 // Copyright (c) 2012 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/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 2241 matching lines @@
   }
   View* active_mouse_view = GetActiveMouseView();
   if (target != active_mouse_view) {
     SendMouseCaptureLostToActiveView();
     active_mouse_view = target;
     SetActiveMouseView(active_mouse_view);
     if (active_mouse_view) {
       gfx::Point target_point(target_menu_loc);
       View::ConvertPointToTarget(
           target_menu, active_mouse_view, &target_point);
-      ui::MouseEvent mouse_entered_event(ui::ET_MOUSE_ENTERED, target_point,
-                                         target_point, ui::EventTimeForNow(), 0,
-                                         0);
+      ui::MouseEvent mouse_entered_event(
+          ui::ET_MOUSE_ENTERED, target_point, target_point,
+          ui::EventTimeForNow(), 0, 0,
+          ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
       active_mouse_view->OnMouseEntered(mouse_entered_event);
 
       ui::MouseEvent mouse_pressed_event(
           ui::ET_MOUSE_PRESSED, target_point, target_point,
-          ui::EventTimeForNow(), event.flags(), event.changed_button_flags());
+          ui::EventTimeForNow(), event.flags(), event.changed_button_flags(),
+          ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
       active_mouse_view->OnMousePressed(mouse_pressed_event);
     }
   }
 
   if (active_mouse_view) {
     gfx::Point target_point(target_menu_loc);
     View::ConvertPointToTarget(target_menu, active_mouse_view, &target_point);
     ui::MouseEvent mouse_dragged_event(
         ui::ET_MOUSE_DRAGGED, target_point, target_point, ui::EventTimeForNow(),
-        event.flags(), event.changed_button_flags());
+        event.flags(), event.changed_button_flags(),
+        ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     active_mouse_view->OnMouseDragged(mouse_dragged_event);
   }
 }
 
 void MenuController::SendMouseReleaseToActiveView(SubmenuView* event_source,
                                                   const ui::MouseEvent& event) {
   View* active_mouse_view = GetActiveMouseView();
   if (!active_mouse_view)
     return;
 
   gfx::Point target_loc(event.location());
   View::ConvertPointToScreen(event_source->GetScrollViewContainer(),
                              &target_loc);
   View::ConvertPointFromScreen(active_mouse_view, &target_loc);
-  ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, target_loc, target_loc,
-                               ui::EventTimeForNow(), event.flags(),
-                               event.changed_button_flags());
+  ui::MouseEvent release_event(
+      ui::ET_MOUSE_RELEASED, target_loc, target_loc, ui::EventTimeForNow(),
+      event.flags(), event.changed_button_flags(),
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   // Reset active mouse view before sending mouse released. That way if it calls
   // back to us, we aren't in a weird state.
   SetActiveMouseView(NULL);
   active_mouse_view->OnMouseReleased(release_event);
 }
 
 void MenuController::SendMouseCaptureLostToActiveView() {
   View* active_mouse_view = GetActiveMouseView();
   if (!active_mouse_view)
     return;
@@ skipping 67 matching lines @@
   }
 }
 
 gfx::Screen* MenuController::GetScreen() {
   Widget* root = owner_ ? owner_->GetTopLevelWidget() : NULL;
   return root ? gfx::Screen::GetScreenFor(root->GetNativeView())
               : gfx::Screen::GetNativeScreen();
 }
 
 }  // namespace views