Moves management of transients out of Window

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"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/events/event.h"
 #include "ui/views/corewm/focus_rules.h"
+#include "ui/views/corewm/window_util.h"
 
 namespace views {
 namespace corewm {
 namespace {
 
 // When a modal window is activated, we bring its entire transient parent chain
 // to the front. This function must be called before the modal transient is
 // stacked at the top to ensure correct stacking order.
 void StackTransientParentsBelowModalWindow(aura::Window* window) {
   if (window->GetProperty(aura::client::kModalKey) != ui::MODAL_TYPE_WINDOW)
     return;
 
-  aura::Window* transient_parent = window->transient_parent();
+  aura::Window* transient_parent = views::corewm::GetTransientParent(window);
   while (transient_parent) {
     transient_parent->parent()->StackChildAtTop(transient_parent);
-    transient_parent = transient_parent->transient_parent();
+    transient_parent = views::corewm::GetTransientParent(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());
+      GetTransientChildren(relative_to));
   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());
   }
@@ skipping 318 matching lines @@
 void FocusController::WindowFocusedFromInputEvent(aura::Window* window) {
   // Only focus |window| if it or any of its parents can be focused. Otherwise
   // FocusWindow() will focus the topmost window, which may not be the
   // currently focused one.
   if (rules_->CanFocusWindow(GetToplevelWindow(window)))
     FocusWindow(window);
 }
 
 }  // namespace corewm
 }  // namespace views