| Index: views/controls/menu/menu_host_root_view.cc
|
| diff --git a/views/controls/menu/menu_host_root_view.cc b/views/controls/menu/menu_host_root_view.cc
|
| index bf2a997443e0efee0e03b77cbb7145da08971037..45a55c6d940cbf82a19a3333209c49f16d9f5104 100644
|
| --- a/views/controls/menu/menu_host_root_view.cc
|
| +++ b/views/controls/menu/menu_host_root_view.cc
|
| @@ -41,19 +41,25 @@ bool MenuHostRootView::OnMouseDragged(const MouseEvent& event) {
|
| return RootView::OnMouseDragged(event);
|
| }
|
|
|
| -void MenuHostRootView::OnMouseReleased(const MouseEvent& event,
|
| - bool canceled) {
|
| +void MenuHostRootView::OnMouseReleased(const MouseEvent& event) {
|
| if (suspend_events_)
|
| return;
|
|
|
| - RootView::OnMouseReleased(event, canceled);
|
| + RootView::OnMouseReleased(event);
|
| if (forward_drag_to_menu_controller_ && GetMenuController()) {
|
| forward_drag_to_menu_controller_ = false;
|
| - if (canceled) {
|
| - GetMenuController()->Cancel(MenuController::EXIT_ALL);
|
| - } else {
|
| - GetMenuController()->OnMouseReleased(submenu_, event);
|
| - }
|
| + GetMenuController()->OnMouseReleased(submenu_, event);
|
| + }
|
| +}
|
| +
|
| +void MenuHostRootView::OnMouseCaptureLost() {
|
| + if (suspend_events_)
|
| + return;
|
| +
|
| + RootView::OnMouseCaptureLost();
|
| + if (forward_drag_to_menu_controller_ && GetMenuController()) {
|
| + forward_drag_to_menu_controller_ = false;
|
| + GetMenuController()->Cancel(MenuController::EXIT_ALL);
|
| }
|
| }
|
|
|
|
|