More unittests passing with new focus controller.

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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
@@ skipping 86 matching lines @@
           window, internal::kShellWindowId_SystemModalContainer);
   }
 
   return true;
 }
 
 aura::Window* AshFocusRules::GetNextActivatableWindow(
     aura::Window* ignore) const {
   DCHECK(ignore);
 
-  size_t current_container_index = 0;
+  size_t 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();
   if (!root)
     root = Shell::GetActiveRootWindow();
   for (size_t i = 0; ignore && i < arraysize(kWindowContainerIds); i++) {
     aura::Window* container = Shell::GetContainer(root, kWindowContainerIds[i]);
     if (container && container->Contains(ignore)) {
-      current_container_index = i;
+      starting_container_index = i;
       break;
     }
   }
 
-  // Look for windows to focus in that container and below.
+  // Look for windows to focus in |ignore|'s container. If none are found, we
+  // look in all the containers in front of |ignore|'s container, then all
+  // behind.
   aura::Window* window = NULL;
-  for (; !window && current_container_index < arraysize(kWindowContainerIds);
-       current_container_index++) {
-    aura::Window::Windows containers =
-        Shell::GetAllContainers(kWindowContainerIds[current_container_index]);
-    for (aura::Window::Windows::const_iterator iter = containers.begin();
-         iter != containers.end() && !window; ++iter) {
-      window = GetTopmostWindowToActivateInContainer((*iter), ignore);
+  for (size_t i = starting_container_index;
+       !window && i < arraysize(kWindowContainerIds);
+       i++) {
+    window = GetTopmostWindowToActivateForContainerIndex(i, ignore);
+  }
+  if (!window) {
+    for (size_t i = starting_container_index - 1;

[sky, 2012/12/13 21:38:06]

If starting_container_index == 0 this is going to overflow.

[Ben Goodger (Google), 2012/12/13 21:47:23]

Done.

+         !window && i < arraysize(kWindowContainerIds);
+         i--) {
+      window = GetTopmostWindowToActivateForContainerIndex(i, ignore);
     }
   }
   return window;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AshFocusRules, private:
 
+aura::Window* AshFocusRules::GetTopmostWindowToActivateForContainerIndex(
+    int index,
+    aura::Window* ignore) const {
+  aura::Window* window = NULL;
+  aura::Window::Windows containers =
+      Shell::GetAllContainers(kWindowContainerIds[index]);
+  for (aura::Window::Windows::const_iterator iter = containers.begin();
+        iter != containers.end() && !window; ++iter) {
+    window = GetTopmostWindowToActivateInContainer((*iter), ignore);
+  }
+  return window;
+}
+
 aura::Window* AshFocusRules::GetTopmostWindowToActivateInContainer(
     aura::Window* container,
     aura::Window* ignore) const {
   // Workspace has an extra level of windows that needs to be special cased.
   if (container->id() == internal::kShellWindowId_DefaultContainer) {
     for (aura::Window::Windows::const_reverse_iterator i =
              container->children().rbegin();
          i != container->children().rend(); ++i) {
       if ((*i)->IsVisible()) {
         aura::Window* window =
             GetTopmostWindowToActivateInContainer(*i, ignore);
         if (window)
           return window;
       }
     }
     return NULL;
   }
   for (aura::Window::Windows::const_reverse_iterator i =
            container->children().rbegin();
        i != container->children().rend();
        ++i) {
     if (*i != ignore && CanActivateWindow(*i) && !wm::IsWindowMinimized(*i))
       return *i;
   }
   return NULL;
 }
 
 }  // namespace wm
 }  // namespace ash