Fixes bug where FocusController would stack a layer directly above a

ui/views/corewm/focus_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 "ui/views/corewm/focus_controller.h"
 
 #include "base/auto_reset.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
@@ skipping 13 matching lines @@
   if (window->GetProperty(aura::client::kModalKey) != ui::MODAL_TYPE_WINDOW)
     return;
 
   aura::Window* transient_parent = window->transient_parent();
   while (transient_parent) {
     transient_parent->parent()->StackChildAtTop(transient_parent);
     transient_parent = transient_parent->transient_parent();
   }
 }
 
+// Stack's |window|'s layer above |relative_to|'s layer.
+void StackWindowLayerAbove(aura::Window* window, aura::Window* relative_to) {
+  // Stack |window| above the last transient child of |relative_to| that shares
+  // the same parent.
+  const aura::Window::Windows& window_transients(
+      relative_to->transient_children());
+  for (aura::Window::Windows::const_iterator i = window_transients.begin();
+       i != window_transients.end(); ++i) {
+    aura::Window* transient = *i;
+    if (transient->parent() == relative_to->parent())
+      relative_to = transient;
+  }
+  if (window != relative_to) {
+    window->layer()->parent()->StackAbove(window->layer(),
+                                          relative_to->layer());
+  }
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // FocusController, public:
 
 FocusController::FocusController(FocusRules* rules)
     : active_window_(NULL),
       focused_window_(NULL),
       updating_focus_(false),
       updating_activation_(false),
@@ skipping 149 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // FocusController, aura::WindowObserver implementation:
 
 void FocusController::OnWindowVisibilityChanged(aura::Window* window,
                                                 bool visible) {
   if (!visible) {
     WindowLostFocusFromDispositionChange(window, window->parent());
     // Despite the focus change, we need to keep the window being hidden
     // stacked above the new window so it stays open on top as it animates away.
     aura::Window* next_window = GetActiveWindow();
-    if (next_window && next_window->parent() == window->parent()) {
-      window->layer()->parent()->StackAbove(window->layer(),
-                                            next_window->layer());
-    }
+    if (next_window && next_window->parent() == window->parent())
+      StackWindowLayerAbove(window, next_window);
   }
 }
 
 void FocusController::OnWindowDestroying(aura::Window* window) {
   WindowLostFocusFromDispositionChange(window, window->parent());
 }
 
 void FocusController::OnWindowHierarchyChanging(
     const HierarchyChangeParams& params) {
   if (params.receiver == active_window_ &&
@@ skipping 100 matching lines @@
     SetFocusedWindow(rules_->GetFocusableWindow(next));
   }
 }
 
 void FocusController::WindowFocusedFromInputEvent(aura::Window* window) {
   FocusWindow(window);
 }
 
 }  // namespace corewm
 }  // namespace views