collect windows from mru_list in workspace_controller.

ash/wm/workspace_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/workspace_controller.h"
 
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
+#include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/fullscreen_window_finder.h"
+#include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/wm_window_animations.h"
 #include "ash/wm/workspace/backdrop_controller.h"
 #include "ash/wm/workspace/backdrop_delegate.h"
 #include "ash/wm/workspace/workspace_event_handler.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/wm/core/window_animations.h"
@@ skipping 30 matching lines @@
 wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {
   if (!viewport_)
     return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
 
   const aura::Window* fullscreen = wm::GetWindowForFullscreenMode(viewport_);
   if (fullscreen && !wm::GetWindowState(fullscreen)->ignored_by_shelf())
     return wm::WORKSPACE_WINDOW_STATE_FULL_SCREEN;
 
   const gfx::Rect shelf_bounds(Shelf::ForWindow(viewport_)->GetIdealBounds());
   bool window_overlaps_launcher = false;
-  // The default container may contain windows that may overlap the launcher
-  // shelf and affect its transparency.
-  aura::Window* container =
-      viewport_->GetRootWindow()->GetChildById(kShellWindowId_DefaultContainer);
-  for (aura::Window* window : container->children()) {
+  auto mru_list = Shell::Get()->mru_window_tracker()->BuildMruWindowList();
+
+  for (aura::Window* window : mru_list) {
+    if (window->GetRootWindow() != viewport_->GetRootWindow())
+      continue;
     wm::WindowState* window_state = wm::GetWindowState(window);
     if (window_state->ignored_by_shelf() ||
         (window->layer() && !window->layer()->GetTargetVisibility())) {
       continue;
     }
     if (window_state->IsMaximized())
       return wm::WORKSPACE_WINDOW_STATE_MAXIMIZED;
     window_overlaps_launcher |= window->bounds().Intersects(shelf_bounds);
   }
 
@@ skipping 38 matching lines @@
 void WorkspaceController::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(window, viewport_);
   viewport_->RemoveObserver(this);
   viewport_ = nullptr;
   // Destroy |event_handler_| too as it depends upon |window|.
   event_handler_.reset();
   layout_manager_ = nullptr;
 }
 
 }  // namespace ash