Activate windows in topmost containers when a window is hidden.

ash/wm/activation_controller.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/activation_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/ui_base_types.h"
 
 namespace ash {
 namespace internal {
 namespace {
 
+// These are the list of container ids of containers which may contain windows
+// that need to be activated in the order that they should be activated.
+const int kWindowContainersCount = 5;

[sky, 2012/03/02 00:20:25]

Can't you use arraysize?

[flackr, 2012/03/02 18:09:28]

Cool, thanks! Done.

+const int kWindowContainers[] = {
+    kShellWindowId_LockSystemModalContainer,
+    kShellWindowId_LockScreenContainer,
+    kShellWindowId_SystemModalContainer,
+    kShellWindowId_AlwaysOnTopContainer,

[flackr, 2012/03/01 23:51:55]

Not sure if this is right. This might be annoying if your always on top windows
are always the next to get focus.

[sky, 2012/03/02 00:20:25]

Maybe we should start in the container you're in. Also, shouldn't this be the
same list as that in SupportsChildActivation?

[flackr, 2012/03/02 18:09:28]

I like that idea, starting from the container you're in. I don't think it should
be possible for a window under the lock screen to get focus and disappear
causing it to ignore the lock screen. Done.

+    kShellWindowId_DefaultContainer,
+};
+
 aura::Window* GetContainer(int id) {
   return Shell::GetInstance()->GetContainer(id);
 }
 
 // Returns true if children of |window| can be activated.
 // These are the only containers in which windows can receive focus.
 bool SupportsChildActivation(aura::Window* window) {
   return window->id() == kShellWindowId_DefaultContainer ||
          window->id() == kShellWindowId_AlwaysOnTopContainer ||
          window->id() == kShellWindowId_PanelContainer ||
@@ skipping 167 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ActivationController, private:
 
 void ActivationController::ActivateNextWindow(aura::Window* window) {
   if (wm::IsActiveWindow(window))
     ActivateWindow(GetTopmostWindowToActivate(window));
 }
 
 aura::Window* ActivationController::GetTopmostWindowToActivate(
     aura::Window* ignore) const {
-  const aura::Window* container =
-      default_container_for_test_ ? default_container_for_test_ :
-          GetContainer(kShellWindowId_DefaultContainer);
-  // When destructing an active window that is in a container destructed after
-  // the default container during shell shutdown, |container| would be NULL
-  // because default container is destructed at this point.
-  if (container) {
-    for (aura::Window::Windows::const_reverse_iterator i =
-             container->children().rbegin();
-         i != container->children().rend();
-         ++i) {
-      if (*i != ignore && CanActivateWindow(*i))
-        return *i;
-    }
+  if (default_container_for_test_) {

[flackr, 2012/03/01 23:51:55]

Currently this prevents me from testing this properly. Do you have any ideas?

[sky, 2012/03/02 00:20:25]

Set it to NULL for your test?

[flackr, 2012/03/02 18:09:28]

Right, I'll do that and use all the standard containers, thanks.

[flackr, 2012/03/02 18:12:23]

This didn't actually end up being an issue.

+    return GetTopmostWindowToActivateInContainer(default_container_for_test_,
+                                                 ignore);
+  }
+
+  aura::Window* window = NULL;
+  for (int i = 0; !window && i < kWindowContainersCount; i++) {
+    window = GetTopmostWindowToActivateInContainer(
+        GetContainer(kWindowContainers[i]),
+        ignore);
+  }
+  return window;
+}
+
+aura::Window* ActivationController::GetTopmostWindowToActivateInContainer(
+    aura::Window* container,
+    aura::Window* ignore) const {
+  for (aura::Window::Windows::const_reverse_iterator i =
+           container->children().rbegin();
+       i != container->children().rend();
+       ++i) {
+    if (*i != ignore && CanActivateWindow(*i))
+      return *i;
   }
   return NULL;
 }
 
 }  // namespace internal
 }  // namespace ash