| Index: ash/wm/ash_focus_rules.cc
|
| diff --git a/ash/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc
|
| index 549ee4a6a7b18494cfa22fad44bdb53ccdd03057..0dcc82df70a44a466988195c304e0719eace59e2 100644
|
| --- a/ash/wm/ash_focus_rules.cc
|
| +++ b/ash/wm/ash_focus_rules.cc
|
| @@ -120,11 +120,10 @@ aura::Window* AshFocusRules::GetTopmostWindowToActivateForContainerIndex(
|
| aura::Window* ignore) const {
|
| aura::Window* window = nullptr;
|
| aura::Window* root = ignore ? ignore->GetRootWindow() : nullptr;
|
| - WmWindow::Windows containers = GetContainersFromAllRootWindows(
|
| - kActivatableShellWindowIds[index], WmWindow::Get(root));
|
| - for (WmWindow* container : containers) {
|
| - window = GetTopmostWindowToActivateInContainer(
|
| - WmWindow::GetAuraWindow(container), ignore);
|
| + aura::Window::Windows containers =
|
| + GetContainersFromAllRootWindows(kActivatableShellWindowIds[index], root);
|
| + for (aura::Window* container : containers) {
|
| + window = GetTopmostWindowToActivateInContainer(container, ignore);
|
| if (window)
|
| return window;
|
| }
|
|
|