Replace WmWindowObserver with aura::WindowObserver.

ash/common/wm_window.h

 // Copyright 2016 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_COMMON_WM_WINDOW_H_
 #define ASH_COMMON_WM_WINDOW_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 31 matching lines @@
 class Widget;
 }
 
 namespace ash {
 
 class ImmersiveFullscreenController;
 class RootWindowController;
 class WmLayoutManager;
 class WmShell;
 class WmTransientWindowObserver;
-class WmWindowObserver;
 class WmWindowTestApi;
 enum class WmWindowProperty;
 
 namespace wm {
 class WindowState;
 }
 
 // WmWindow abstracts away differences between ash running in classic mode
 // and ash running with aura-mus.
 //
@@ skipping 284 matching lines @@
   // snaps the layer associated with this window to the layer associated with
   // the ancestor.
   void SnapToPixelBoundaryIfNecessary();
 
   // Makes the hit region for children slightly larger for easier resizing.
   void SetChildrenUseExtendedHitRegion();
 
   // Returns a View that renders the contents of this window's layers.
   std::unique_ptr<views::View> CreateViewWithRecreatedLayers();
 
-  void AddObserver(WmWindowObserver* observer);
-  void RemoveObserver(WmWindowObserver* observer);
-  bool HasObserver(const WmWindowObserver* observer) const;
-
   void AddTransientWindowObserver(WmTransientWindowObserver* observer);
   void RemoveTransientWindowObserver(WmTransientWindowObserver* observer);
 
   // Adds or removes a handler to receive events targeted at this window, before
   // this window handles the events itself; the handler does not recieve events
   // from embedded windows. This only supports windows with internal widgets;
   // see GetInternalWidget(). Ownership of the handler is not transferred.
   //
   // Also note that the target of these events is always an aura::Window.
   void AddLimitedPreTargetHandler(ui::EventHandler* handler);
   void RemoveLimitedPreTargetHandler(ui::EventHandler* handler);
 
  private:
   friend class WmWindowTestApi;
 
   explicit WmWindow(aura::Window* window);
 
   // aura::WindowObserver:
-  void OnWindowHierarchyChanging(const HierarchyChangeParams& params) override;
-  void OnWindowHierarchyChanged(const HierarchyChangeParams& params) override;
-  void OnWindowStackingChanged(aura::Window* window) override;
   void OnWindowPropertyChanged(aura::Window* window,
                                const void* key,
                                intptr_t old) override;
-  void OnWindowBoundsChanged(aura::Window* window,
-                             const gfx::Rect& old_bounds,
-                             const gfx::Rect& new_bounds) override;
-  void OnWindowDestroying(aura::Window* window) override;
-  void OnWindowDestroyed(aura::Window* window) override;
-  void OnWindowVisibilityChanging(aura::Window* window, bool visible) override;
-  void OnWindowVisibilityChanged(aura::Window* window, bool visible) override;
-  void OnWindowTitleChanged(aura::Window* window) override;
 
   // ::wm::TransientWindowObserver overrides:
   void OnTransientChildAdded(aura::Window* window,
                              aura::Window* transient) override;
   void OnTransientChildRemoved(aura::Window* window,
                                aura::Window* transient) override;
 
   aura::Window* window_;
 
-  base::ObserverList<WmWindowObserver> observers_;
-
   bool added_transient_observer_ = false;
   base::ObserverList<WmTransientWindowObserver> transient_observers_;
 
   // If true child windows should get a slightly larger hit region to make
   // resizing easier.
   bool children_use_extended_hit_region_ = false;
 
   // Default value for |use_empty_minimum_size_for_testing_|.
   static bool default_use_empty_minimum_size_for_testing_;
 
   // If true the minimum size is 0x0, default is minimum size comes from widget.
   bool use_empty_minimum_size_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(WmWindow);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_WINDOW_H_