| Index: ui/views/controls/menu/menu_runner_impl.cc
|
| diff --git a/ui/views/controls/menu/menu_runner_impl.cc b/ui/views/controls/menu/menu_runner_impl.cc
|
| index d02f7de1eff520e79f6e8dd96d6e8424522d3a2d..b48edcdd1291d33184e9bef72dd59955a8278938 100644
|
| --- a/ui/views/controls/menu/menu_runner_impl.cc
|
| +++ b/ui/views/controls/menu/menu_runner_impl.cc
|
| @@ -88,8 +88,12 @@ MenuRunner::RunResult MenuRunnerImpl::RunMenuAt(Widget* parent,
|
| if (!controller->IsBlockingRun()) {
|
| controller->CancelAll();
|
| controller = NULL;
|
| + } else {
|
| + // Only nest the delegate when not cancelling drag-and-drop. When
|
| + // cancelling this will become the root delegate of the new
|
| + // MenuController
|
| + controller->AddNestedDelegate(this);
|
| }
|
| - controller->AddNestedDelegate(this);
|
| } else {
|
| // There's some other menu open and we're not nested. Cancel the menu.
|
| controller->CancelAll();
|
|
|