Moves transient window observer methods out of WindowObserver

ash/wm/immersive_fullscreen_controller.h

 // 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.
 
 #ifndef ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_
 #define ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_
 
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/wm/immersive_revealed_lock.h"
 #include "base/timer/timer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/animation/animation_delegate.h"
+#include "ui/views/corewm/transient_window_observer.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
 class Point;
 class Rect;
 class SlideAnimation;
 }
 
 namespace ui {
 class LocatedEvent;
 }
 
 namespace views {
 class View;
 class Widget;
 }
 
 namespace ash {
 
 class ASH_EXPORT ImmersiveFullscreenController
     : public gfx::AnimationDelegate,
       public ui::EventHandler,
+      public views::corewm::TransientWindowObserver,
       public views::FocusChangeListener,
       public views::WidgetObserver,
-      public aura::WindowObserver,
       public ImmersiveRevealedLock::Delegate {
  public:
   // The enum is used for an enumerated histogram. New items should be only
   // added to the end.
   enum WindowType {
     WINDOW_TYPE_OTHER,
     WINDOW_TYPE_BROWSER,
     WINDOW_TYPE_HOSTED_APP,
     WINDOW_TYPE_PACKAGED_APP,
     WINDOW_TYPE_COUNT
@@ skipping 79 matching lines @@
 
   // views::WidgetObserver overrides:
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
   virtual void OnWidgetActivationChanged(views::Widget* widget,
                                          bool active) OVERRIDE;
 
   // gfx::AnimationDelegate overrides:
   virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
   virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
-  // aura::WindowObserver overrides:
-  virtual void OnAddTransientChild(aura::Window* window,
-                                   aura::Window* transient) OVERRIDE;
-  virtual void OnRemoveTransientChild(aura::Window* window,
-                                      aura::Window* transient) OVERRIDE;
+  // views::coremw::TransientWindowObserver overrides:

[Ben Goodger (Google), 2014/01/09 18:43:18]

corewm

+  virtual void OnTransientChildAdded(aura::Window* window,
+                                     aura::Window* transient) OVERRIDE;
+  virtual void OnTransientChildRemoved(aura::Window* window,
+                                       aura::Window* transient) OVERRIDE;
 
   // ash::ImmersiveRevealedLock::Delegate overrides:
   virtual void LockRevealedState(AnimateReveal animate_reveal) OVERRIDE;
   virtual void UnlockRevealedState() OVERRIDE;
 
  private:
   friend class ImmersiveFullscreenControllerTest;
 
   enum Animate {
     ANIMATE_NO,
@@ skipping 129 matching lines @@
   scoped_ptr<BubbleManager> bubble_manager_;
 
   base::WeakPtrFactory<ImmersiveFullscreenController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ImmersiveFullscreenController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_IMMERSIVE_FULLSCREEN_CONTROLLER_H_