Replace WmWindowObserver with aura::WindowObserver.

ash/common/wm/overview/window_selector.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_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_H_
 #define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/wm_activation_observer.h"
-#include "ash/common/wm_window_observer.h"
 #include "base/macros.h"
 #include "base/time/time.h"
+#include "ui/aura/window_observer.h"
 #include "ui/display/display_observer.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 
 namespace views {
 class Textfield;
 class Widget;
 }
 
 namespace ash {
 class WindowSelectorDelegate;
 class WindowSelectorItem;
 class WindowSelectorTest;
 class WindowGrid;
 
 // The WindowSelector shows a grid of all of your windows, allowing to select
 // one by clicking or tapping on it.
 class ASH_EXPORT WindowSelector : public display::DisplayObserver,
-                                  public WmWindowObserver,
+                                  public aura::WindowObserver,
                                   public WmActivationObserver,
                                   public views::TextfieldController {
  public:
   // Returns true if the window can be selected in overview mode.
   static bool IsSelectable(WmWindow* window);
 
   enum Direction { LEFT, UP, RIGHT, DOWN };
 
   using WindowList = std::vector<WmWindow*>;
 
@@ skipping 35 matching lines @@
   int text_filter_bottom() const { return text_filter_bottom_; }
 
   bool is_shut_down() const { return is_shut_down_; }
 
   // display::DisplayObserver:
   void OnDisplayAdded(const display::Display& display) override;
   void OnDisplayRemoved(const display::Display& display) override;
   void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t metrics) override;
 
-  // WmWindowObserver:
-  void OnWindowTreeChanged(WmWindow* window,
-                           const TreeChangeParams& params) override;
-  void OnWindowDestroying(WmWindow* window) override;
+  // aura::WindowObserver:
+  void OnWindowHierarchyChanged(const HierarchyChangeParams& params) override;
+  void OnWindowDestroying(aura::Window* window) override;
 
   // WmActivationObserver
   void OnWindowActivated(WmWindow* gained_active,
                          WmWindow* lost_active) override;
   void OnAttemptToReactivateWindow(WmWindow* request_active,
                                    WmWindow* actual_active) override;
 
   // views::TextfieldController:
   void ContentsChanged(views::Textfield* sender,
                        const base::string16& new_contents) override;
@@ skipping 84 matching lines @@
   int text_filter_bottom_;
 
   bool is_shut_down_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WindowSelector);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_H_