| 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 d07d1efcc758ffbfc90ad68b9ed5f31d86a7b8c9..c6750a6e0cd51be18d9470a45969bed6b27c0e4c 100644
|
| --- a/ui/views/controls/menu/menu_host.cc
|
| +++ b/ui/views/controls/menu/menu_host.cc
|
| @@ -219,9 +219,13 @@ void MenuHost::OnDragWillStart() {
|
| }
|
|
|
| void MenuHost::OnDragComplete() {
|
| + // If we are being destroyed there is no guarantee that the menu items are
|
| + // available.
|
| + if (destroying_)
|
| + return;
|
| MenuController* menu_controller =
|
| submenu_->GetMenuItem()->GetMenuController();
|
| - if (destroying_ || !menu_controller)
|
| + if (!menu_controller)
|
| return;
|
|
|
| bool should_close = true;
|
|
|