Aura: Add non-browser windows into the list of "Alt + Tab" cycle list.

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"
@@ skipping 37 matching lines @@
 // 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) {
   for (size_t i = 0; i < arraysize(kWindowContainerIds); i++) {
     if (window->id() == kWindowContainerIds[i])
       return true;
   }
   return false;
 }
 
+bool HasModalTransientChild(aura::Window* window) {
+  aura::Window::Windows::const_iterator it;
+  for (it = window->transient_children().begin();
+       it != window->transient_children().end();
+       ++it) {
+    if ((*it)->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_WINDOW)
+      return true;
+  }
+  return false;
+}
+
 // Returns true if |window| can be activated or deactivated.
 // A window manager typically defines some notion of "top level window" that
 // supports activation/deactivation.
 bool CanActivateWindow(aura::Window* window, const aura::Event* event) {
   return window &&
       window->IsVisible() &&
       (!aura::client::GetActivationDelegate(window) ||
-        aura::client::GetActivationDelegate(window)->ShouldActivate(event)) &&
-      SupportsChildActivation(window->parent());
+       !event ||

[sky, 2012/03/27 14:59:58]

Why are you adding the '!event' clause? It is legal to pass NULL to
CanActivateWindow.

[yoshiki, 2012/03/28 15:08:41]

Done. Un-changed.

+       aura::client::GetActivationDelegate(window)->ShouldActivate(event)) &&
+    SupportsChildActivation(window->parent());

[sky, 2012/03/27 14:59:58]

fix indentation.

[yoshiki, 2012/03/28 15:08:41]

Done.

 }
 
 // When a modal window is activated, we bring its entire transient parent chain
 // to the front. This function must be called before the modal transient is
 // stacked at the top to ensure correct stacking order.
 void StackTransientParentsBelowModalWindow(aura::Window* window) {
   if (window->GetProperty(aura::client::kModalKey) != ui::MODAL_TYPE_WINDOW)
     return;
 
   aura::Window* transient_parent = window->transient_parent();
@@ skipping 32 matching lines @@
     // If |child| isn't activatable, but has transient parent, trace
     // that path instead.
     if (child->transient_parent())
       return GetActivatableWindow(child->transient_parent(), event);
     parent = parent->parent();
     child = child->parent();
   }
   return NULL;
 }
 
+bool ActivationController::CanActivateWindowItself(aura::Window* window) {
+  return CanActivateWindow(window, NULL) && !HasModalTransientChild(window);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ActivationController, aura::client::ActivationClient implementation:
 
 void ActivationController::ActivateWindow(aura::Window* window) {
   ActivateWindowWithEvent(window, NULL);
 }
 
 void ActivationController::DeactivateWindow(aura::Window* window) {
   if (window)
     ActivateNextWindow(window);
@@ skipping 144 matching lines @@
        i != container->children().rend();
        ++i) {
     if (*i != ignore && CanActivateWindow(*i, NULL))
       return *i;
   }
   return NULL;
 }
 
 }  // namespace internal
 }  // namespace ash