Index: ash/shelf/shelf_layout_manager.cc |
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc |
index 1779e8bbabf5aec8b280937965d27691d5ba9cc2..2d39905bb45245d8ff8812ecd6d5b664f6fcd9e7 100644 |
--- a/ash/shelf/shelf_layout_manager.cc |
+++ b/ash/shelf/shelf_layout_manager.cc |
@@ -876,14 +876,13 @@ gfx::Rect ShelfLayoutManager::GetAutoHideShowShelfRegionInScreen() const { |
} |
bool ShelfLayoutManager::HasVisibleWindow() const { |
- WmWindow* root = |
- WmWindow::Get(shelf_widget_->GetNativeWindow())->GetRootWindow(); |
- const std::vector<WmWindow*> windows = |
+ aura::Window* root = shelf_widget_->GetNativeWindow()->GetRootWindow(); |
+ const aura::Window::Windows windows = |
Shell::Get()->mru_window_tracker()->BuildWindowListIgnoreModal(); |
// Process the window list and check if there are any visible windows. |
// Ignore app list windows that may be animating to hide after dismissal. |
for (auto* window : windows) { |
- if (window->IsVisible() && !IsAppListWindow(window->aura_window()) && |
+ if (window->IsVisible() && !IsAppListWindow(window) && |
root->Contains(window)) { |
return true; |
} |