Moves transient window observer methods out of WindowObserver

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/transient_window_manager.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 {
 
@@ skipping 430 matching lines @@
 }
 
 void ImmersiveFullscreenController::AnimationProgressed(
     const gfx::Animation* animation) {
   delegate_->SetVisibleFraction(animation->GetCurrentValue());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // aura::WindowObserver overrides:
 
-void ImmersiveFullscreenController::OnAddTransientChild(
+void ImmersiveFullscreenController::OnTransientChildAdded(
     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);
   }
 }
 
-void ImmersiveFullscreenController::OnRemoveTransientChild(
+void ImmersiveFullscreenController::OnTransientChildRemoved(
     aura::Window* window,
     aura::Window* transient) {
   bubble_manager_->StopObserving(transient);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::ImmersiveRevealedLock::Delegate overrides:
 
 void ImmersiveFullscreenController::LockRevealedState(
     AnimateReveal animate_reveal) {
@@ skipping 19 matching lines @@
   if (observers_enabled_ == enable)
     return;
   observers_enabled_ = enable;
 
   views::FocusManager* focus_manager = widget_->GetFocusManager();
 
   if (enable) {
     widget_->AddObserver(this);
     focus_manager->AddFocusChangeListener(this);
     Shell::GetInstance()->AddPreTargetHandler(this);
-    native_window_->AddObserver(this);
+    views::corewm::TransientWindowManager::Get(native_window_)->
+        AddObserver(this);
 
     RecreateBubbleManager();
   } else {
     widget_->RemoveObserver(this);
     focus_manager->RemoveFocusChangeListener(this);
     Shell::GetInstance()->RemovePreTargetHandler(this);
-    native_window_->RemoveObserver(this);
+    views::corewm::TransientWindowManager::Get(native_window_)->
+        RemoveObserver(this);
 
     // We have stopped observing whether transient children are added or removed
     // to |native_window_|. The set of bubbles that BubbleManager is observing
     // will become stale really quickly. Destroy BubbleManager and recreate it
     // when we start observing |native_window_| again.
     bubble_manager_.reset();
 
     animation_->Stop();
   }
 }
@@ skipping 376 matching lines @@
         AsBubbleDelegate(transient_child);
     if (bubble_delegate &&
         bubble_delegate->GetAnchorView() &&
         top_container_->Contains(bubble_delegate->GetAnchorView())) {
       bubble_manager_->StartObserving(transient_child);
     }
   }
 }
 
 }  // namespace ash