Replace WmWindowObserver with aura::WindowObserver.

ash/common/wm/window_cycle_list.h

 // Copyright 2014 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_CYCLE_LIST_H_
 #define ASH_COMMON_WM_WINDOW_CYCLE_LIST_H_
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/wm/window_cycle_controller.h"
-#include "ash/common/wm_window_observer.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "base/timer/timer.h"
+#include "ui/aura/window_observer.h"
 #include "ui/display/display_observer.h"
 
 namespace display {
 class Screen;
 }
 
 namespace views {
 class Widget;
 }
 
 namespace ash {
 
 class WindowCycleView;
 
 // Tracks a set of Windows that can be stepped through. This class is used by
 // the WindowCycleController.
-class ASH_EXPORT WindowCycleList : public WmWindowObserver,
+class ASH_EXPORT WindowCycleList : public aura::WindowObserver,
                                    public display::DisplayObserver {
  public:
   using WindowList = std::vector<WmWindow*>;
 
   explicit WindowCycleList(const WindowList& windows);
   ~WindowCycleList() override;
 
   bool empty() const { return windows_.empty(); }
 
   // Cycles to the next or previous window based on |direction|.
   void Step(WindowCycleController::Direction direction);
 
   int current_index() const { return current_index_; }
 
   void set_user_did_accept(bool user_did_accept) {
     user_did_accept_ = user_did_accept;
   }
 
  private:
   friend class WindowCycleControllerTest;
 
   static void DisableInitialDelayForTesting();
   const views::Widget* widget() const { return cycle_ui_widget_; }
 
   const WindowList& windows() const { return windows_; }
 
-  // WmWindowObserver overrides:
+  // aura::WindowObserver overrides:
   // There is a chance a window is destroyed, for example by JS code. We need to
   // take care of that even if it is not intended for the user to close a window
   // while window cycling.
-  void OnWindowDestroying(WmWindow* window) override;
+  void OnWindowDestroying(aura::Window* window) override;
 
   // display::DisplayObserver overrides:
   void OnDisplayAdded(const display::Display& new_display) override;
   void OnDisplayRemoved(const display::Display& old_display) override;
   void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t changed_metrics) override;
 
   // Returns true if the window list overlay should be shown.
   bool ShouldShowUi();
 
@@ skipping 26 matching lines @@
 
   // A timer to delay showing the UI. Quick Alt+Tab should not flash a UI.
   base::OneShotTimer show_ui_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowCycleList);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_WINDOW_CYCLE_LIST_H_