| 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 3b3b28aef0ad288ab33ba35ec5a1cedc4c8f5be1..3c1246ec00fd163a9872450f14fac72237c740fd 100644
|
| --- a/ash/common/wm/panels/panel_layout_manager.cc
|
| +++ b/ash/common/wm/panels/panel_layout_manager.cc
|
| @@ -11,6 +11,7 @@
|
| #include "ash/common/shelf/wm_shelf.h"
|
| #include "ash/common/shelf/wm_shelf_util.h"
|
| #include "ash/common/shell_window_ids.h"
|
| +#include "ash/common/wm/overview/window_selector_controller.h"
|
| #include "ash/common/wm/window_animation_types.h"
|
| #include "ash/common/wm/window_parenting_utils.h"
|
| #include "ash/common/wm/window_state.h"
|
| @@ -578,9 +579,11 @@ void PanelLayoutManager::Relayout() {
|
| // interfered with overview mode animations. However, layouts need to be done
|
| // when the WindowSelectorController is restoring minimized windows so that
|
| // they actually become visible.
|
| - WmShell* shell = panel_container_->GetShell();
|
| - if (in_layout_ || (shell->IsOverviewModeSelecting() &&
|
| - !shell->IsOverviewModeRestoringMinimizedWindows())) {
|
| + WindowSelectorController* window_selector_controller =
|
| + WmShell::Get()->window_selector_controller();
|
| + if (in_layout_ ||
|
| + (window_selector_controller->IsSelecting() &&
|
| + !window_selector_controller->IsRestoringMinimizedWindows())) {
|
| return;
|
| }
|
|
|
|
|