Beginnings of Window Modality support.

ui/aura_shell/stacking_controller.cc

 // Copyright (c) 2011 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 "ui/aura_shell/stacking_controller.h"
 
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/always_on_top_controller.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_window_ids.h"
 
 namespace aura_shell {
 namespace internal {
 namespace {
 
 aura::Window* GetContainer(int id) {
   return Shell::GetInstance()->GetContainer(id);
 }
 
 // Returns true if children of |window| can be activated.
 bool SupportsChildActivation(aura::Window* window) {
   return window->id() == kShellWindowId_DefaultContainer ||
-         window->id() == kShellWindowId_AlwaysOnTopContainer;
+         window->id() == kShellWindowId_AlwaysOnTopContainer ||
+         window->id() == kShellWindowId_ModalContainer;
+}
+
+bool IsWindowModal(aura::Window* window) {
+  return window->transient_parent() && window->GetIntProperty(aura::kModalKey);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, public:
 
 StackingController::StackingController() {
   aura::Desktop::GetInstance()->SetStackingClient(this);
 }
@@ skipping 26 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, aura::StackingClient implementation:
 
 void StackingController::AddChildToDefaultParent(aura::Window* window) {
   aura::Window* parent = NULL;
   switch (window->type()) {
     case aura::WINDOW_TYPE_NORMAL:
     case aura::WINDOW_TYPE_POPUP:
+      if (IsWindowModal(window)) {
+        parent = GetContainer(internal::kShellWindowId_ModalContainer);
+        break;
+      }
       parent = always_on_top_controller_->GetContainer(window);
       break;
     case aura::WINDOW_TYPE_MENU:
     case aura::WINDOW_TYPE_TOOLTIP:
       parent = GetContainer(internal::kShellWindowId_MenusAndTooltipsContainer);
       break;
     default:
       NOTREACHED() << "Window " << window->id()
                    << " has unhandled type " << window->type();
       break;
@@ skipping 17 matching lines @@
   }
   return NULL;
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, private:
 
 }  // namespace internal
 }  // namespace aura_shell