Ports SystemModalContainerLayoutManager to ash/common

ash/wm/screen_pinning_controller.cc

 // Copyright 2016 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/screen_pinning_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_dimmer.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_observer.h"
 #include "ash/common/wm_window_user_data.h"
 #include "ash/display/window_tree_host_manager.h"
-#include "ash/shell.h"
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/window_observer.h"
 
 namespace ash {
 namespace {
 
 // Returns a list of WmWindows corresponding to SystemModalContainers,
 // except ones whose root is shared with |pinned_window|.
 std::vector<WmWindow*> GetSystemModalWindowsExceptPinned(
     WmWindow* pinned_window) {
   WmWindow* pinned_root = pinned_window->GetRootWindow();
 
   std::vector<WmWindow*> result;
-  for (WmWindow* system_modal :
-       WmWindowAura::FromAuraWindows(Shell::GetContainersFromAllRootWindows(
-           kShellWindowId_SystemModalContainer, nullptr))) {
+  for (WmWindow* system_modal : wm::GetContainersFromAllRootWindows(
+           kShellWindowId_SystemModalContainer)) {
     if (system_modal->GetRootWindow() == pinned_root)
       continue;
     result.push_back(system_modal);
   }
   return result;
 }
 
 void AddObserverToChildren(WmWindow* container,
                            aura::WindowObserver* observer) {
   for (WmWindow* child : container->GetChildren()) {
@@ skipping 294 matching lines @@
     return;
 
   WindowDimmer* window_dimmer = window_dimmers_->Get(container);
   if (window_dimmer) {
     base::AutoReset<bool> auto_reset(&in_restacking_, true);
     container->StackChildAtBottom(window_dimmer->window());
   }
 }
 
 }  // namespace ash