Create a unified UIElement interface for Widget, View and Window.

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/ash_export.h"
+#include "ash/common/devtools/ui_element.h"

[Fady Samuel, 2017/03/24 22:36:21]

Get rid of this. Include in the cc.

Forward declare here.

 #include "base/macros.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 {
 
 class WmWindow;
 
 namespace devtools {
 
 class ASH_EXPORT AshDevToolsDOMAgentObserver {
  public:
-  virtual void OnWindowBoundsChanged(WmWindow* window) {}
-  virtual void OnWidgetBoundsChanged(views::Widget* widget) {}
-  virtual void OnViewBoundsChanged(views::View* view) {}
+  virtual void OnUIElementBoundsChanged(UIElement* ui_element);
 };
 
 class ASH_EXPORT AshDevToolsDOMAgent
     : public NON_EXPORTED_BASE(ui::devtools::UiDevToolsBaseAgent<
-                               ui::devtools::protocol::DOM::Metainfo>),
-      public aura::WindowObserver,
-      public views::WidgetObserver,
-      public views::WidgetRemovalsObserver,
-      public views::ViewObserver {
+                               ui::devtools::protocol::DOM::Metainfo>) {
  public:
   AshDevToolsDOMAgent();
   ~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 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;
-
-  // views::ViewObserver
-  void OnChildViewRemoved(views::View* parent, views::View* view) override;
-  void OnChildViewAdded(views::View* parent, views::View* view) override;
-  void OnChildViewReordered(views::View* parent, views::View*) override;
-  void OnViewBoundsChanged(views::View* view) override;
-
   WmWindow* GetWindowFromNodeId(int nodeId);
   views::Widget* GetWidgetFromNodeId(int nodeId);
   views::View* GetViewFromNodeId(int nodeId);
 
   int GetNodeIdFromWindow(WmWindow* window);
   int GetNodeIdFromWidget(views::Widget* widget);
   int GetNodeIdFromView(views::View* view);
 
   void AddObserver(AshDevToolsDOMAgentObserver* observer);
   void RemoveObserver(AshDevToolsDOMAgentObserver* observer);
 
  private:
   std::unique_ptr<ui::devtools::protocol::DOM::Node> BuildInitialTree();
   std::unique_ptr<ui::devtools::protocol::DOM::Node> BuildTreeForWindow(
       WmWindow* window);
   std::unique_ptr<ui::devtools::protocol::DOM::Node> BuildTreeForRootWidget(
       views::Widget* widget);
   std::unique_ptr<ui::devtools::protocol::DOM::Node> BuildTreeForView(
       views::View* view);
 
+  void OnWindowHierarchyChanging(
+      const aura::WindowObserver::HierarchyChangeParams& params);
+  void OnWindowHierarchyChanged(
+      const aura::WindowObserver::HierarchyChangeParams& params);
+
   void AddWindowTree(WmWindow* window);
   // |remove_observer| ensures that we don't add a duplicate observer in any
   // observer callback. For example, |remove_observer| is false when rebuilding
   // the tree in OnWindowStackingChanged so that the observer is not removed and
   // re-added, thus causing endless calls on the observer.
   void RemoveWindowTree(WmWindow* window, bool remove_observer);
   void RemoveWindowNode(WmWindow* window, bool remove_observer);
 
   // Don't need AddWidgetTree because |widget| will always be inside a window,
   // so when windows are created, their widget nodes are created as well.
@@ skipping 43 matching lines @@
 
   base::ObserverList<AshDevToolsDOMAgentObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AshDevToolsDOMAgent);
 };
 
 }  // namespace devtools
 }  // namespace ash
 
 #endif  // ASH_COMMON_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_