Chromium Code Reviews| 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 796ecc37ff4dff318d76855eae6d57a06b262eb3..22654d714e611a31c1d3566e57b68a56292a56d2 100644 |
| --- a/ui/views/controls/menu/menu_controller.cc |
| +++ b/ui/views/controls/menu/menu_controller.cc |
| @@ -441,6 +441,11 @@ MenuItemView* MenuController::Run(Widget* parent, |
| // The lock handles the case if the button was destroyed. |
| pressed_lock_.reset(nested_pressed_lock.release()); |
| + // If we're closing all menus, also mark the next topmost menu |
| + // message loop for termination, so that we'll unwind fully. |
| + if (exit_type_ == EXIT_ALL && message_loop_depth_) |
| + TerminateNestedMessageLoop(); |
|
sky
2015/01/06 01:00:15
Move this up to around 437'ish. An else case for t
spang
2015/01/06 19:14:12
Done.
|
| + |
| return result; |
| } |