Moves management of transients out of Window

ui/views/corewm/window_modality_controller.cc

Index: ui/views/corewm/window_modality_controller.cc
diff --git a/ui/views/corewm/window_modality_controller.cc b/ui/views/corewm/window_modality_controller.cc
index b52a9d6ad8ce8da604870573fb9786b170a0fa85..30999c52fed65a43b73088feadf64c541768d6a6 100644
--- a/ui/views/corewm/window_modality_controller.cc
+++ b/ui/views/corewm/window_modality_controller.cc
@@ -16,6 +16,7 @@
 #include "ui/events/event.h"
 #include "ui/events/event_target.h"
 #include "ui/events/gestures/gesture_recognizer.h"
+#include "ui/views/corewm/transient_window_manager.h"
 #include "ui/views/corewm/window_animations.h"
 #include "ui/views/corewm/window_util.h"
 
@@ -63,13 +64,13 @@ bool IsModalTransientChild(aura::Window* transient, aura::Window* original) {
 aura::Window* GetModalTransientChild(
     aura::Window* activatable,
     aura::Window* original) {
-  aura::Window::Windows::const_iterator it;
-  for (it = activatable->transient_children().begin();
-       it != activatable->transient_children().end();
+  for (aura::Window::Windows::const_iterator it =
+           GetTransientChildren(activatable).begin();
+       it != GetTransientChildren(activatable).end();
        ++it) {
     aura::Window* transient = *it;
     if (IsModalTransientChild(transient, original)) {
-      return transient->transient_children().empty() ?
+      return GetTransientChildren(transient).empty() ?
           transient : GetModalTransientChild(transient, original);
     }
   }
@@ -153,8 +154,8 @@ void WindowModalityController::OnWindowPropertyChanged(aura::Window* window,
       window->GetProperty(aura::client::kModalKey) != ui::MODAL_TYPE_NONE &&
       window->IsVisible()) {
     ActivateWindow(window);
-    ui::GestureRecognizer::Get()->TransferEventsTo(
-        window->transient_parent(), NULL);
+    ui::GestureRecognizer::Get()->TransferEventsTo(GetTransientParent(window),
+                                                   NULL);
   }
 }
 
@@ -163,8 +164,8 @@ void WindowModalityController::OnWindowVisibilityChanged(
     bool visible) {
   if (visible && window->GetProperty(aura::client::kModalKey) !=
       ui::MODAL_TYPE_NONE) {
-    ui::GestureRecognizer::Get()->TransferEventsTo(
-        window->transient_parent(), NULL);
+    ui::GestureRecognizer::Get()->TransferEventsTo(GetTransientParent(window),
+                                                   NULL);
     // Make sure no other window has capture, otherwise |window| won't get mouse
     // events.
     aura::Window* capture_window = aura::client::GetCaptureWindow(window);