| Index: ui/views/controls/menu/menu_runner.cc
|
| diff --git a/ui/views/controls/menu/menu_runner.cc b/ui/views/controls/menu/menu_runner.cc
|
| index 9308cc92fa17948f16d0b14ee9343be64eb91497..d29e24cefd7ac4883130c6a6b8023d6732407d2c 100644
|
| --- a/ui/views/controls/menu/menu_runner.cc
|
| +++ b/ui/views/controls/menu/menu_runner.cc
|
| @@ -317,7 +317,7 @@ MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent,
|
| // The parent of the nested menu will have created a DisplayChangeListener, so
|
| // we avoid creating a DisplayChangeListener if nested. Drop menus are
|
| // transient, so we don't cancel in that case.
|
| - if ((types & (IS_NESTED | FOR_DROP)) == 0) {
|
| + if ((types & (IS_NESTED | FOR_DROP)) == 0 && parent) {
|
| display_change_listener_.reset(
|
| internal::DisplayChangeListener::Create(parent, this));
|
| }
|
|
|