Replace WmWindowObserver with aura::WindowObserver.

ash/common/devtools/ash_devtools_dom_agent.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_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
 #define ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
 
 #include "ash/common/wm_shell.h"
-#include "ash/common/wm_window_observer.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "components/ui_devtools/DOM.h"
 #include "components/ui_devtools/devtools_base_agent.h"
+#include "ui/aura/window_observer.h"
 #include "ui/views/view.h"
 #include "ui/views/view_observer.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/widget/widget_removals_observer.h"
 
 namespace ash {
 namespace devtools {
 
 class ASH_EXPORT AshDevToolsDOMAgentObserver {
  public:
   virtual void OnWindowBoundsChanged(WmWindow* window) {}
   virtual void OnWidgetBoundsChanged(views::Widget* widget) {}
   virtual void OnViewBoundsChanged(views::View* view) {}
 };
 
 class ASH_EXPORT AshDevToolsDOMAgent
     : public NON_EXPORTED_BASE(ui::devtools::UiDevToolsBaseAgent<
                                ui::devtools::protocol::DOM::Metainfo>),
-      public WmWindowObserver,
+      public aura::WindowObserver,
       public views::WidgetObserver,
       public views::WidgetRemovalsObserver,
       public views::ViewObserver {
  public:
   AshDevToolsDOMAgent(ash::WmShell* shell);
   ~AshDevToolsDOMAgent() override;
 
   // DOM::Backend
   ui::devtools::protocol::Response disable() override;
   ui::devtools::protocol::Response getDocument(
       std::unique_ptr<ui::devtools::protocol::DOM::Node>* out_root) override;
   ui::devtools::protocol::Response highlightNode(
       std::unique_ptr<ui::devtools::protocol::DOM::HighlightConfig>
           highlight_config,
       ui::devtools::protocol::Maybe<int> node_id) override;
   ui::devtools::protocol::Response hideHighlight() override;
 
   // WindowObserver
-  void OnWindowTreeChanging(WmWindow* window,
-                            const TreeChangeParams& params) override;
-  void OnWindowTreeChanged(WmWindow* window,
-                           const TreeChangeParams& params) override;
-  void OnWindowStackingChanged(WmWindow* window) override;
-  void OnWindowBoundsChanged(WmWindow* window,
+  void OnWindowHierarchyChanging(const HierarchyChangeParams& params) override;
+  void OnWindowHierarchyChanged(const HierarchyChangeParams& params) override;
+  void OnWindowStackingChanged(aura::Window* window) override;
+  void OnWindowBoundsChanged(aura::Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
 
   // views::WidgetRemovalsObserver
   void OnWillRemoveView(views::Widget* widget, views::View* view) override;
 
   // views::WidgetObserver
   void OnWidgetBoundsChanged(views::Widget* widget,
                              const gfx::Rect& new_bounds) override;
 
@@ skipping 80 matching lines @@
 
   base::ObserverList<AshDevToolsDOMAgentObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AshDevToolsDOMAgent);
 };
 
 }  // namespace devtools
 }  // namespace ash
 
 #endif  // ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_