| Index: ash/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
|
| index 5d1df483a645aad4991f1ac5c227b65d78caf56c..390ab225750de60c3a32c859fe8a60bd53f0da88 100644
|
| --- a/ash/shelf/shelf_layout_manager.cc
|
| +++ b/ash/shelf/shelf_layout_manager.cc
|
| @@ -27,6 +27,7 @@
|
| #include "ash/wm/mru_window_tracker.h"
|
| #include "ash/wm/window_animations.h"
|
| #include "ash/wm/window_properties.h"
|
| +#include "ash/wm/window_state.h"
|
| #include "ash/wm/window_util.h"
|
| #include "ash/wm/workspace_controller.h"
|
| #include "base/auto_reset.h"
|
| @@ -1010,7 +1011,7 @@ ShelfAutoHideState ShelfLayoutManager::CalculateAutoHideState(
|
| bool visible_window = false;
|
| for (size_t i = 0; i < windows.size(); ++i) {
|
| if (windows[i] && windows[i]->IsVisible() &&
|
| - !ash::wm::IsWindowMinimized(windows[i]) &&
|
| + !wm::GetWindowState(windows[i])->IsMinimized() &&
|
| root_window_ == windows[i]->GetRootWindow()) {
|
| visible_window = true;
|
| break;
|
|
|