Moves management of transients out of Window

ash/wm/immersive_fullscreen_controller.cc

 // Copyright 2013 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 "ash/wm/immersive_fullscreen_controller.h"
 
 #include <set>
 
 #include "ash/shell.h"
 #include "ash/wm/window_state.h"
 #include "base/metrics/histogram.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/corewm/window_util.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 using views::View;
 
 namespace ash {
 
 namespace {
 
 // Duration for the reveal show/hide slide animation. The slower duration is
@@ skipping 45 matching lines @@
   return widget->widget_delegate()->AsBubbleDelegate();
 }
 
 // Returns true if |maybe_transient| is a transient child of |toplevel|.
 bool IsWindowTransientChildOf(aura::Window* maybe_transient,
                               aura::Window* toplevel) {
   if (!maybe_transient || !toplevel)
     return false;
 
   for (aura::Window* window = maybe_transient; window;
-       window = window->transient_parent()) {
+       window = views::corewm::GetTransientParent(window)) {
     if (window == toplevel)
       return true;
   }
   return false;
 }
 
 // Returns the location of |event| in screen coordinates.
 gfx::Point GetEventLocationInScreen(const ui::LocatedEvent& event) {
   gfx::Point location_in_screen = event.location();
   aura::Window* target = static_cast<aura::Window*>(event.target());
@@ skipping 363 matching lines @@
 }
 
 void ImmersiveFullscreenController::AnimationProgressed(
     const gfx::Animation* animation) {
   delegate_->SetVisibleFraction(animation->GetCurrentValue());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // aura::WindowObserver overrides:
 
-void ImmersiveFullscreenController::OnAddTransientChild(aura::Window* window,
-                                                     aura::Window* transient) {
+void ImmersiveFullscreenController::OnAddTransientChild(
+    aura::Window* window,
+    aura::Window* transient) {
   views::BubbleDelegateView* bubble_delegate = AsBubbleDelegate(transient);
   if (bubble_delegate &&
       bubble_delegate->GetAnchorView() &&
       top_container_->Contains(bubble_delegate->GetAnchorView())) {
     // Observe the aura::Window because the BubbleDelegateView may not be
     // parented to the widget's root view yet so |bubble_delegate->GetWidget()|
     // may still return NULL.
     bubble_manager_->StartObserving(transient);
   }
 }
@@ skipping 421 matching lines @@
       Shell::GetScreen()->GetDisplayNearestPoint(location).bounds();
   return (!screen_bounds.Contains(location) &&
           location.y() < hit_bounds_in_screen.y() &&
           location.x() >= hit_bounds_in_screen.x() &&
           location.x() < hit_bounds_in_screen.right());
 }
 
 void ImmersiveFullscreenController::RecreateBubbleManager() {
   bubble_manager_.reset(new BubbleManager(this));
   const std::vector<aura::Window*> transient_children =
-      native_window_->transient_children();
+      views::corewm::GetTransientChildren(native_window_);
   for (size_t i = 0; i < transient_children.size(); ++i) {
     aura::Window* transient_child = transient_children[i];
     views::BubbleDelegateView* bubble_delegate =
         AsBubbleDelegate(transient_child);
     if (bubble_delegate &&
         bubble_delegate->GetAnchorView() &&
         top_container_->Contains(bubble_delegate->GetAnchorView())) {
       bubble_manager_->StartObserving(transient_child);
     }
   }
 }
 
 }  // namespace ash