[cros Aura] Added modal container for screen lock.

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_ModalContainer;
+         window->id() == kShellWindowId_ModalContainer ||
+         window->id() == kShellWindowId_LockModalContainer;
 }
 
 bool IsWindowModal(aura::Window* window) {
   return window->transient_parent() && window->GetIntProperty(aura::kModalKey);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, public:
@@ skipping 31 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);
+        parent = GetModalContainer(window);
         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()
@@ skipping 17 matching lines @@
     if (*i != ignore && (*i)->CanActivate())
       return *i;
   }
   return NULL;
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, private:
 
+aura::Window* StackingController::GetModalContainer(
+    aura::Window* window) const {
+  if (!IsWindowModal(window))
+    return NULL;
+
+  // If screen lock is not active, all modal windows are placed into the
+  // normal modal container.
+  aura::Window* lock_container =
+      GetContainer(internal::kShellWindowId_LockScreenContainer);
+  if (!lock_container->children().size())
+    return GetContainer(internal::kShellWindowId_ModalContainer);
+
+  // Otherwise those that originate from LockScreen container and above are
+  // placed in the screen lock modal container.
+  int lock_container_id = lock_container->id();
+  int window_container_id = window->transient_parent()->parent()->id();
+
+  if (window_container_id < lock_container_id)
+    return GetContainer(internal::kShellWindowId_ModalContainer);
+  else

[Ben Goodger (Google), 2011/11/29 16:42:26]

nit: no else after return

[Nikita (slow), 2011/11/29 17:12:32]

Done.

+    return GetContainer(internal::kShellWindowId_LockModalContainer);
+}
+
 }  // namespace internal
 }  // namespace aura_shell