| Index: ash/wm/ash_focus_rules.cc
|
| diff --git a/ash/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc
|
| index e6688d73654b8230057af224591c140be64c7c41..02b2d021dbee65f017afe27c24f4cc483219f0c5 100644
|
| --- a/ash/wm/ash_focus_rules.cc
|
| +++ b/ash/wm/ash_focus_rules.cc
|
| @@ -105,7 +105,7 @@ aura::Window* AshFocusRules::GetNextActivatableWindow(
|
| int starting_container_index = 0;
|
| // If the container of the window losing focus is in the list, start from that
|
| // container.
|
| - aura::RootWindow* root = ignore->GetRootWindow();
|
| + aura::Window* root = ignore->GetRootWindow();
|
| if (!root)
|
| root = Shell::GetTargetRootWindow();
|
| int container_count = static_cast<int>(arraysize(kWindowContainerIds));
|
| @@ -137,7 +137,7 @@ aura::Window* AshFocusRules::GetTopmostWindowToActivateForContainerIndex(
|
| int index,
|
| aura::Window* ignore) const {
|
| aura::Window* window = NULL;
|
| - aura::RootWindow* root = ignore ? ignore->GetRootWindow() : NULL;
|
| + aura::Window* root = ignore ? ignore->GetRootWindow() : NULL;
|
| aura::Window::Windows containers = Shell::GetContainersFromAllRootWindows(
|
| kWindowContainerIds[index], root);
|
| for (aura::Window::Windows::const_iterator iter = containers.begin();
|
|
|