[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);
+        aura::Window* lock_container =
+            GetContainer(internal::kShellWindowId_LockScreenContainer);
+        // Lock/login screen has its own modal container.
+        if (!lock_container->children().size())

[Ben Goodger (Google), 2011/11/28 17:12:56]

I realized there is a flaw here that will require some more complexity.

If the modal window is coming from a window behind the lock screen (consider a
page showing a js modal alert), then showing the modal dialog above the lock
screen would violate the privacy of the user whose session was locked.

Thus the following makes sense to me:

When a lock screen is active, modal dialogs opened from content in containers
behind the lock screen should still open in the regular modal container. The
event filter there would be superceded by the event filter attached to the lock
screen since the lock screen one is in front of it in the z-index and is thus
consulted first.

Modal windows opened from content in the lock container, or any container in
front of it, would be opened in the lock modal container.

So, I think you'll have to write a little more code here (perhaps move out to a
separate function since this function is going to be pretty long otherwise)...
and adjust your tests to consider both these cases.

[Nikita (slow), 2011/11/29 10:06:34]

Done.

+          parent = GetContainer(internal::kShellWindowId_ModalContainer);
+        else
+          parent = GetContainer(internal::kShellWindowId_LockModalContainer);
         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 19 matching lines @@
   }
   return NULL;
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, private:
 
 }  // namespace internal
 }  // namespace aura_shell