Moves management of transients out of Window

ui/views/corewm/base_focus_rules.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/base_focus_rules.h"
 
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/views/corewm/window_modality_controller.h"
+#include "ui/views/corewm/window_util.h"
 
 namespace views {
 namespace corewm {
 namespace {
 
 aura::Window* GetFocusedWindow(aura::Window* context) {
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(context);
   return focus_client ? focus_client->GetFocusedWindow() : NULL;
 }
@@ skipping 91 matching lines @@
       return child;
 
     // CanActivateWindow() above will return false if |child| is blocked by a
     // modal transient. In this case the modal is or contains the activatable
     // window. We recurse because the modal may itself be blocked by a modal
     // transient.
     aura::Window* modal_transient = GetModalTransient(child);
     if (modal_transient)
       return GetActivatableWindow(modal_transient);
 
-    if (child->transient_parent()) {
+    if (views::corewm::GetTransientParent(child)) {
       // To avoid infinite recursion, if |child| has a transient parent
       // whose own modal transient is |child| itself, just return |child|.
       aura::Window* parent_modal_transient =
-          GetModalTransient(child->transient_parent());
+          GetModalTransient(views::corewm::GetTransientParent(child));
       if (parent_modal_transient == child)
         return child;
 
-      return GetActivatableWindow(child->transient_parent());
+      return GetActivatableWindow(views::corewm::GetTransientParent(child));
     }
 
     parent = parent->parent();
     child = child->parent();
   }
   return NULL;
 }
 
 aura::Window* BaseFocusRules::GetFocusableWindow(aura::Window* window) const {
   if (CanFocusWindow(window))
@@ skipping 45 matching lines @@
     if (cur == ignore)
       continue;
     if (CanActivateWindow(cur))
       return cur;
   }
   return NULL;
 }
 
 }  // namespace corewm
 }  // namespace views