Ports SystemModalContainerLayoutManager to ash/common

ash/wm/ash_focus_rules.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/ash_focus_rules.h"
 
 #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/focus_rules.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace wm {
@@ skipping 91 matching lines @@
   }
   return window;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AshFocusRules, private:
 
 aura::Window* AshFocusRules::GetTopmostWindowToActivateForContainerIndex(
     int index,
     aura::Window* ignore) const {
-  aura::Window* window = NULL;
-  aura::Window* root = ignore ? ignore->GetRootWindow() : NULL;
-  aura::Window::Windows containers = Shell::GetContainersFromAllRootWindows(
-      kActivatableShellWindowIds[index], root);
-  for (aura::Window::Windows::const_iterator iter = containers.begin();
-       iter != containers.end() && !window; ++iter) {
-    window = GetTopmostWindowToActivateInContainer((*iter), ignore);
+  aura::Window* window = nullptr;
+  aura::Window* root = ignore ? ignore->GetRootWindow() : nullptr;
+  WmWindow::Windows containers = GetContainersFromAllRootWindows(
+      kActivatableShellWindowIds[index], WmWindowAura::Get(root));
+  for (WmWindow* container : containers) {
+    window = GetTopmostWindowToActivateInContainer(
+        WmWindowAura::GetAuraWindow(container), ignore);
+    if (window)
+      return window;
   }
   return window;
 }
 
 aura::Window* AshFocusRules::GetTopmostWindowToActivateInContainer(
     aura::Window* container,
     aura::Window* ignore) const {
   for (aura::Window::Windows::const_reverse_iterator i =
            container->children().rbegin();
        i != container->children().rend(); ++i) {
     WindowState* window_state = GetWindowState(*i);
     if (*i != ignore && window_state->CanActivate() &&
         !window_state->IsMinimized())
       return *i;
   }
   return NULL;
 }
 
 }  // namespace wm
 }  // namespace ash