| 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 b3a6adacecfd3197cc01a845b7e06019ed13fdbe..210104c0c7d262146b61b7473e70023ecd4d587a 100644
|
| --- a/ui/views/controls/menu/menu_controller.cc
|
| +++ b/ui/views/controls/menu/menu_controller.cc
|
| @@ -2371,14 +2371,15 @@ 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, gfx::PointF(target_point),
|
| + gfx::PointF(target_point), ui::EventTimeForNow(), 0, 0);
|
| 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::ET_MOUSE_PRESSED, gfx::PointF(target_point),
|
| + gfx::PointF(target_point), ui::EventTimeForNow(), event.flags(),
|
| + event.changed_button_flags());
|
| active_mouse_view->OnMousePressed(mouse_pressed_event);
|
| }
|
| }
|
| @@ -2387,8 +2388,9 @@ 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_dragged_event(
|
| - ui::ET_MOUSE_DRAGGED, target_point, target_point, ui::EventTimeForNow(),
|
| - event.flags(), event.changed_button_flags());
|
| + ui::ET_MOUSE_DRAGGED, gfx::PointF(target_point),
|
| + gfx::PointF(target_point), ui::EventTimeForNow(), event.flags(),
|
| + event.changed_button_flags());
|
| active_mouse_view->OnMouseDragged(mouse_dragged_event);
|
| }
|
| }
|
| @@ -2403,9 +2405,9 @@ 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, gfx::PointF(target_loc),
|
| + gfx::PointF(target_loc), ui::EventTimeForNow(),
|
| + event.flags(), event.changed_button_flags());
|
| // 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);
|
|
|