Move DevTools out of ash and turn it to a component.

components/ui_devtools/views/ui_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_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
-#define ASH_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
+#ifndef COMPONENTS_UI_DEVTOOLS_VIEWS_UI_DEVTOOLS_DOM_AGENT_H_
+#define COMPONENTS_UI_DEVTOOLS_VIEWS_UI_DEVTOOLS_DOM_AGENT_H_
 
-#include "ash/ash_export.h"
-#include "ash/devtools/ui_element_delegate.h"
-#include "base/macros.h"
 #include "components/ui_devtools/DOM.h"
 #include "components/ui_devtools/devtools_base_agent.h"
+#include "components/ui_devtools/views/ui_element_delegate.h"
 #include "ui/aura/env_observer.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace aura {
 class Window;
 }
 
-namespace ash {
+namespace ui {
 namespace devtools {
 
 class UIElement;
 
-class ASH_EXPORT AshDevToolsDOMAgentObserver {
+class UIDevToolsDOMAgentObserver {
  public:
   // TODO(thanhph): Use UIElement* as input argument instead.
   virtual void OnNodeBoundsChanged(int node_id) = 0;
 };
 
-class ASH_EXPORT AshDevToolsDOMAgent
+class UIDevToolsDOMAgent
     : public NON_EXPORTED_BASE(ui::devtools::UiDevToolsBaseAgent<

[sadrul, 2017/06/14 03:25:57]

You should not need NON_EXPORTED_BASE.

[thanhph, 2017/06/14 15:26:37]

Done.

                                ui::devtools::protocol::DOM::Metainfo>),
       public UIElementDelegate,
       public aura::EnvObserver {
  public:
-  AshDevToolsDOMAgent();
-  ~AshDevToolsDOMAgent() override;
+  UIDevToolsDOMAgent();
+  ~UIDevToolsDOMAgent() 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;
 
   // UIElementDelegate:
   void OnUIElementAdded(UIElement* parent, UIElement* child) override;
   void OnUIElementReordered(UIElement* parent, UIElement* child) override;
   void OnUIElementRemoved(UIElement* ui_element) override;
   void OnUIElementBoundsChanged(UIElement* ui_element) override;
   bool IsHighlightingWindow(aura::Window* window) override;
 
-  void AddObserver(AshDevToolsDOMAgentObserver* observer);
-  void RemoveObserver(AshDevToolsDOMAgentObserver* observer);
+  void AddObserver(UIDevToolsDOMAgentObserver* observer);
+  void RemoveObserver(UIDevToolsDOMAgentObserver* observer);
   UIElement* GetElementFromNodeId(int node_id);
   UIElement* window_element_root() const { return window_element_root_.get(); };
   const std::vector<aura::Window*>& root_windows() const {
     return root_windows_;
   };
 
  private:
   // aura::EnvObserver:
   void OnWindowInitialized(aura::Window* window) override {}
   void OnHostInitialized(aura::WindowTreeHost* host) override;
@@ skipping 21 matching lines @@
   ui::devtools::protocol::Response HighlightNode(
       std::unique_ptr<ui::devtools::protocol::DOM::HighlightConfig>
           highlight_config,
       int node_id);
 
   bool is_building_tree_;
   std::unique_ptr<UIElement> window_element_root_;
   std::unordered_map<int, UIElement*> node_id_to_ui_element_;
   std::unique_ptr<views::Widget> widget_for_highlighting_;
   std::vector<aura::Window*> root_windows_;
-  base::ObserverList<AshDevToolsDOMAgentObserver> observers_;
+  base::ObserverList<UIDevToolsDOMAgentObserver> observers_;
 
-  DISALLOW_COPY_AND_ASSIGN(AshDevToolsDOMAgent);
+  DISALLOW_COPY_AND_ASSIGN(UIDevToolsDOMAgent);
 };
 
 }  // namespace devtools
-}  // namespace ash
+}  // namespace ui
 
-#endif  // ASH_DEVTOOLS_ASH_DEVTOOLS_DOM_AGENT_H_
+#endif  // COMPONENTS_UI_DEVTOOLS_VIEWS_UI_DEVTOOLS_DOM_AGENT_H_