Allow stacking below windows with layers with NULL delegates.

ui/aura/window.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 "ui/aura/window.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 875 matching lines @@
            children_[final_target_i + 1]->HasTransientAncestor(target)) {
       ++final_target_i;
     }
   }
 
   // By convention we don't stack on top of windows with layers with NULL
   // delegates.  Walk backward to find a valid target window.
   // See tests WindowTest.StackingMadrigal and StackOverClosingTransient
   // for an explanation of this.
   while (final_target_i > 0 &&
-         children_[final_target_i]->layer()->delegate() == NULL) {
+         children_[direction == STACK_ABOVE ? final_target_i :
+                                              final_target_i - 1]->layer()

[flackr, 2013/11/04 22:04:12]

This change should make the check in 901 unnecessary.

+             ->delegate() == NULL) {
     --final_target_i;
   }
 
-  // Allow stacking immediately below a window with a NULL layer.
-  if (direction == STACK_BELOW && target_i != final_target_i)
-    direction = STACK_ABOVE;
-
   Window* final_target = children_[final_target_i];
 
   // If we couldn't find a valid target position, don't move anything.
-  if (final_target->layer()->delegate() == NULL)
+  if (direction == STACK_ABOVE && final_target->layer()->delegate() == NULL)
     return;
 
   // Don't try to stack a child above itself.
   if (child == final_target)
     return;
 
   // Move the child.
   StackChildRelativeToImpl(child, final_target, direction);
 
   // Stack any transient children that share the same parent to be in front of
@@ skipping 231 matching lines @@
   bool contains_mouse = false;
   if (IsVisible()) {
     WindowEventDispatcher* dispatcher = GetDispatcher();
     contains_mouse = dispatcher &&
         ContainsPointInRoot(dispatcher->GetLastMouseLocationInRoot());
   }
   return contains_mouse;
 }
 
 }  // namespace aura