Index: ui/views/controls/menu/menu_controller.cc |
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc |
index 2702529c43d08d38b4a31479217295307b3a1311..9099ba59146f0405997d15554f4c84dfda6b207a 100644 |
--- a/ui/views/controls/menu/menu_controller.cc |
+++ b/ui/views/controls/menu/menu_controller.cc |
@@ -2259,14 +2259,16 @@ void MenuController::UpdateActiveMouseView(SubmenuView* event_source, |
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); |
} |
} |
@@ -2276,7 +2278,8 @@ void MenuController::UpdateActiveMouseView(SubmenuView* event_source, |
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); |
} |
} |
@@ -2291,9 +2294,10 @@ void MenuController::SendMouseReleaseToActiveView(SubmenuView* event_source, |
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); |