Moves management of transients out of Window

ui/views/corewm/window_modality_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/window_modality_controller.h"
 
 #include <algorithm>
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/ui_base_types.h"
 #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"
 
 namespace views {
 namespace corewm {
 
 // Transient child's modal parent.
 extern const aura::WindowProperty<aura::Window*>* const kModalParentKey;
 DEFINE_WINDOW_PROPERTY_KEY(aura::Window*, kModalParentKey, NULL);
 
@@ skipping 27 matching lines @@
   return transient->IsVisible() &&
       (TransientChildIsWindowModal(transient) ||
        TransientChildIsSystemModal(transient) ||
        (TransientChildIsChildModal(transient) &&
         (HasAncestor(original, GetModalParent(transient)))));
 }
 
 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);
     }
   }
   return NULL;
 }
 
 }  // namespace
 
 void SetModalParent(aura::Window* child, aura::Window* parent) {
   child->SetProperty(kModalParentKey, parent);
@@ skipping 63 matching lines @@
 
 void WindowModalityController::OnWindowPropertyChanged(aura::Window* window,
                                                        const void* key,
                                                        intptr_t old) {
   // In tests, we sometimes create the modality relationship after a window is
   // visible.
   if (key == aura::client::kModalKey &&
       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);
   }
 }
 
 void WindowModalityController::OnWindowVisibilityChanged(
     aura::Window* window,
     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);
     if (capture_window)
       capture_window->ReleaseCapture();
   }
 }
 
 void WindowModalityController::OnWindowDestroyed(aura::Window* window) {
   windows_.erase(std::find(windows_.begin(), windows_.end(), window));
   window->RemoveObserver(this);
 }
 
 bool WindowModalityController::ProcessLocatedEvent(aura::Window* target,
                                                    ui::LocatedEvent* event) {
   if (event->handled())
     return false;
   aura::Window* modal_transient_child = GetModalTransient(target);
   if (modal_transient_child && (event->type() == ui::ET_MOUSE_PRESSED ||
                                 event->type() == ui::ET_TOUCH_PRESSED)) {
     AnimateWindow(modal_transient_child, WINDOW_ANIMATION_TYPE_BOUNCE);
   }
   if (event->type() == ui::ET_TOUCH_CANCELLED)
     return false;
   return !!modal_transient_child;
 }
 
 }  // namespace corewm
 }  // namespace views