| Index: ash/common/wm/panels/panel_layout_manager.cc
|
| diff --git a/ash/common/wm/panels/panel_layout_manager.cc b/ash/common/wm/panels/panel_layout_manager.cc
|
| index 3c1246ec00fd163a9872450f14fac72237c740fd..0aeb65c388c64adc1455839984e6757b2f9940ae 100644
|
| --- a/ash/common/wm/panels/panel_layout_manager.cc
|
| +++ b/ash/common/wm/panels/panel_layout_manager.cc
|
| @@ -572,7 +572,7 @@ void PanelLayoutManager::RestorePanel(WmWindow* panel) {
|
| }
|
|
|
| void PanelLayoutManager::Relayout() {
|
| - if (!shelf_)
|
| + if (!shelf_ || !shelf_->GetWindow())
|
| return;
|
|
|
| // Suppress layouts during overview mode because changing window bounds
|
|
|