| Index: ui/views/controls/menu/menu_host.cc
|
| diff --git a/ui/views/controls/menu/menu_host.cc b/ui/views/controls/menu/menu_host.cc
|
| index 2716ec8bb782c1a46288c0ab449d80a2a96e2caf..f7a004849c5217376dc46112a9728b61aa11c979 100644
|
| --- a/ui/views/controls/menu/menu_host.cc
|
| +++ b/ui/views/controls/menu/menu_host.cc
|
| @@ -110,8 +110,11 @@ void MenuHost::OnMouseCaptureLost() {
|
| return;
|
| MenuController* menu_controller =
|
| submenu_->GetMenuItem()->GetMenuController();
|
| - if (menu_controller && !menu_controller->drag_in_progress())
|
| + if (menu_controller &&
|
| + !menu_controller->drag_in_progress() &&
|
| + !child_drag_in_progress()) {
|
| menu_controller->CancelAll();
|
| + }
|
| Widget::OnMouseCaptureLost();
|
| }
|
|
|
|
|