Rename UIDevToolsDOMAgent to DOMAgent.

Because ui_devtools_dom_agent.(h|cc) are already in ui_devtools
namespace, UIDevToolsDOMAgent class can be simplified as DOMAgent.
Dependent files will change accordingly.

BUG=752601
R=sadrul@chromium.org, thanhph@chromium.org
Signed-off-by: zhuoyu.qian <zhuoyu.qian@samsung.com>
Change-Id: Ide16bd0e4589021deb19d90abacd5437fcb1d589
Reviewed-on: https://chromium-review.googlesource.com/727481
Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512899}

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

@@ -17,7 +17,7 @@
 #include "base/run_loop.h"
 #include "components/ui_devtools/devtools_server.h"
 #include "components/ui_devtools/views/css_agent.h"
-#include "components/ui_devtools/views/ui_devtools_dom_agent.h"
+#include "components/ui_devtools/views/dom_agent.h"
 #include "components/ui_devtools/views/ui_devtools_overlay_agent.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/service_manager_connection.h"
@@ -113,7 +113,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit() {
   // Start devtools server
   devtools_server_ = ui_devtools::UiDevToolsServer::Create(nullptr);
   if (devtools_server_) {
-    auto dom_backend = base::MakeUnique<ui_devtools::UIDevToolsDOMAgent>();
+    auto dom_backend = base::MakeUnique<ui_devtools::DOMAgent>();
     auto overlay_backend =
         base::MakeUnique<ui_devtools::UIDevToolsOverlayAgent>(
             dom_backend.get());

components/ui_devtools/views/BUILD.gn

@@ -13,8 +13,8 @@ source_set("views") {
   sources = [
     "css_agent.cc",
     "css_agent.h",
-    "ui_devtools_dom_agent.cc",
-    "ui_devtools_dom_agent.h",
+    "dom_agent.cc",
+    "dom_agent.h",
     "ui_devtools_overlay_agent.cc",
     "ui_devtools_overlay_agent.h",
     "ui_element.cc",

components/ui_devtools/views/css_agent.cc

@@ -118,7 +118,7 @@ Response ParseProperties(const std::string& style_text,
 
 }  // namespace
 
-CSSAgent::CSSAgent(UIDevToolsDOMAgent* dom_agent) : dom_agent_(dom_agent) {
+CSSAgent::CSSAgent(DOMAgent* dom_agent) : dom_agent_(dom_agent) {
   DCHECK(dom_agent_);
 }
 

components/ui_devtools/views/css_agent.h

@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "components/ui_devtools/CSS.h"
-#include "components/ui_devtools/views/ui_devtools_dom_agent.h"
+#include "components/ui_devtools/views/dom_agent.h"
 
 namespace ui_devtools {
 
@@ -15,9 +15,9 @@ class UIElement;
 
 class CSSAgent : public ui_devtools::UiDevToolsBaseAgent<
                      ui_devtools::protocol::CSS::Metainfo>,
-                 public UIDevToolsDOMAgentObserver {
+                 public DOMAgentObserver {
  public:
-  explicit CSSAgent(UIDevToolsDOMAgent* dom_agent);
+  explicit CSSAgent(DOMAgent* dom_agent);
   ~CSSAgent() override;
 
   // CSS::Backend:
@@ -34,7 +34,7 @@ class CSSAgent : public ui_devtools::UiDevToolsBaseAgent<
           ui_devtools::protocol::Array<ui_devtools::protocol::CSS::CSSStyle>>*
           result) override;
 
-  // UIDevToolsDOMAgentObserver:
+  // DOMAgentObserver:
   void OnElementBoundsChanged(UIElement* ui_element) override;
 
  private:
@@ -47,7 +47,7 @@ class CSSAgent : public ui_devtools::UiDevToolsBaseAgent<
   bool SetPropertiesForUIElement(UIElement* ui_element,
                                  const gfx::Rect& bounds,
                                  bool visible);
-  UIDevToolsDOMAgent* const dom_agent_;
+  DOMAgent* const dom_agent_;
 
   DISALLOW_COPY_AND_ASSIGN(CSSAgent);
 };

components/ui_devtools/views/ui_devtools_dom_agent.cc → components/ui_devtools/views/dom_agent.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/ui_devtools/views/ui_devtools_dom_agent.h"
+#include "components/ui_devtools/views/dom_agent.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -441,37 +441,36 @@ void DrawR1IntersectsR2(const gfx::RectF& pinned_rect_f,
 
 }  // namespace
 
-UIDevToolsDOMAgent::UIDevToolsDOMAgent()
+DOMAgent::DOMAgent()
     : is_building_tree_(false),
       show_size_on_canvas_(false),
       highlight_rect_config_(HighlightRectsConfiguration::NO_DRAW) {
   aura::Env::GetInstance()->AddObserver(this);
 }
 
-UIDevToolsDOMAgent::~UIDevToolsDOMAgent() {
+DOMAgent::~DOMAgent() {
   aura::Env::GetInstance()->RemoveObserver(this);
   Reset();
 }
 
-ui_devtools::protocol::Response UIDevToolsDOMAgent::disable() {
+ui_devtools::protocol::Response DOMAgent::disable() {
   Reset();
   return ui_devtools::protocol::Response::OK();
 }
 
-ui_devtools::protocol::Response UIDevToolsDOMAgent::getDocument(
+ui_devtools::protocol::Response DOMAgent::getDocument(
     std::unique_ptr<ui_devtools::protocol::DOM::Node>* out_root) {
   *out_root = BuildInitialTree();
   return ui_devtools::protocol::Response::OK();
 }
 
-ui_devtools::protocol::Response UIDevToolsDOMAgent::hideHighlight() {
+ui_devtools::protocol::Response DOMAgent::hideHighlight() {
   if (layer_for_highlighting_ && layer_for_highlighting_->visible())
     layer_for_highlighting_->SetVisible(false);
   return ui_devtools::protocol::Response::OK();
 }
 
-ui_devtools::protocol::Response
-UIDevToolsDOMAgent::pushNodesByBackendIdsToFrontend(
+ui_devtools::protocol::Response DOMAgent::pushNodesByBackendIdsToFrontend(
     std::unique_ptr<protocol::Array<int>> backend_node_ids,
     std::unique_ptr<protocol::Array<int>>* result) {
   *result = protocol::Array<int>::create();
@@ -480,7 +479,7 @@ UIDevToolsDOMAgent::pushNodesByBackendIdsToFrontend(
   return ui_devtools::protocol::Response::OK();
 }
 
-void UIDevToolsDOMAgent::OnUIElementAdded(UIElement* parent, UIElement* child) {
+void DOMAgent::OnUIElementAdded(UIElement* parent, UIElement* child) {
   // When parent is null, only need to update |node_id_to_ui_element_|.
   if (!parent) {
     node_id_to_ui_element_[child->node_id()] = child;
@@ -499,8 +498,7 @@ void UIDevToolsDOMAgent::OnUIElementAdded(UIElement* parent, UIElement* child) {
                                 BuildTreeForUIElement(child));
 }
 
-void UIDevToolsDOMAgent::OnUIElementReordered(UIElement* parent,
-                                              UIElement* child) {
+void DOMAgent::OnUIElementReordered(UIElement* parent, UIElement* child) {
   DCHECK(node_id_to_ui_element_.count(parent->node_id()));
 
   const auto& children = parent->children();
@@ -512,33 +510,32 @@ void UIDevToolsDOMAgent::OnUIElementReordered(UIElement* parent,
                                 BuildDomNodeFromUIElement(child));
 }
 
-void UIDevToolsDOMAgent::OnUIElementRemoved(UIElement* ui_element) {
+void DOMAgent::OnUIElementRemoved(UIElement* ui_element) {
   DCHECK(node_id_to_ui_element_.count(ui_element->node_id()));
 
   RemoveDomNode(ui_element);
   node_id_to_ui_element_.erase(ui_element->node_id());
 }
 
-void UIDevToolsDOMAgent::OnUIElementBoundsChanged(UIElement* ui_element) {
+void DOMAgent::OnUIElementBoundsChanged(UIElement* ui_element) {
   for (auto& observer : observers_)
     observer.OnElementBoundsChanged(ui_element);
 }
 
-void UIDevToolsDOMAgent::AddObserver(UIDevToolsDOMAgentObserver* observer) {
+void DOMAgent::AddObserver(DOMAgentObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void UIDevToolsDOMAgent::RemoveObserver(UIDevToolsDOMAgentObserver* observer) {
+void DOMAgent::RemoveObserver(DOMAgentObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-UIElement* UIDevToolsDOMAgent::GetElementFromNodeId(int node_id) {
+UIElement* DOMAgent::GetElementFromNodeId(int node_id) {
   return node_id_to_ui_element_[node_id];
 }
 
-ui_devtools::protocol::Response UIDevToolsDOMAgent::HighlightNode(
-    int node_id,
-    bool show_size) {
+ui_devtools::protocol::Response DOMAgent::HighlightNode(int node_id,
+                                                        bool show_size) {
   if (!layer_for_highlighting_) {
     layer_for_highlighting_.reset(new ui::Layer(ui::LayerType::LAYER_TEXTURED));
     layer_for_highlighting_->set_name("HighlightingLayer");
@@ -563,9 +560,8 @@ ui_devtools::protocol::Response UIDevToolsDOMAgent::HighlightNode(
   return ui_devtools::protocol::Response::OK();
 }
 
-int UIDevToolsDOMAgent::FindElementIdTargetedByPoint(
-    const gfx::Point& p,
-    aura::Window* root_window) const {
+int DOMAgent::FindElementIdTargetedByPoint(const gfx::Point& p,
+                                           aura::Window* root_window) const {
   aura::Window* targeted_window = root_window->GetEventHandlerForPoint(p);
   if (!targeted_window)
     return 0;
@@ -590,8 +586,7 @@ int UIDevToolsDOMAgent::FindElementIdTargetedByPoint(
       targeted_view);
 }
 
-void UIDevToolsDOMAgent::ShowDistancesInHighlightOverlay(int pinned_id,
-                                                         int element_id) {
+void DOMAgent::ShowDistancesInHighlightOverlay(int pinned_id, int element_id) {
   const std::pair<aura::Window*, gfx::Rect> pair_r2(
       node_id_to_ui_element_[element_id]->GetNodeWindowAndBounds());
   const std::pair<aura::Window*, gfx::Rect> pair_r1(
@@ -637,7 +632,7 @@ void UIDevToolsDOMAgent::ShowDistancesInHighlightOverlay(int pinned_id,
   }
 }
 
-int UIDevToolsDOMAgent::GetParentIdOfNodeId(int node_id) const {
+int DOMAgent::GetParentIdOfNodeId(int node_id) const {
   DCHECK(node_id_to_ui_element_.count(node_id));
   const UIElement* element = node_id_to_ui_element_.at(node_id);
   if (element->parent() && element->parent() != window_element_root_.get())
@@ -645,7 +640,7 @@ int UIDevToolsDOMAgent::GetParentIdOfNodeId(int node_id) const {
   return 0;
 }
 
-void UIDevToolsDOMAgent::OnPaintLayer(const ui::PaintContext& context) {
+void DOMAgent::OnPaintLayer(const ui::PaintContext& context) {
   const gfx::Rect& screen_bounds(layer_for_highlighting_->bounds());
   ui::PaintRecorder recorder(context, screen_bounds.size());
   gfx::Canvas* canvas = recorder.canvas();
@@ -786,17 +781,16 @@ void UIDevToolsDOMAgent::OnPaintLayer(const ui::PaintContext& context) {
   }
 }
 
-void UIDevToolsDOMAgent::OnHostInitialized(aura::WindowTreeHost* host) {
+void DOMAgent::OnHostInitialized(aura::WindowTreeHost* host) {
   root_windows_.push_back(host->window());
 }
 
-void UIDevToolsDOMAgent::OnElementBoundsChanged(UIElement* ui_element) {
+void DOMAgent::OnElementBoundsChanged(UIElement* ui_element) {
   for (auto& observer : observers_)
     observer.OnElementBoundsChanged(ui_element);
 }
 
-std::unique_ptr<ui_devtools::protocol::DOM::Node>
-UIDevToolsDOMAgent::BuildInitialTree() {
+std::unique_ptr<ui_devtools::protocol::DOM::Node> DOMAgent::BuildInitialTree() {
   is_building_tree_ = true;
   std::unique_ptr<Array<DOM::Node>> children = Array<DOM::Node>::create();
 
@@ -819,7 +813,7 @@ UIDevToolsDOMAgent::BuildInitialTree() {
 }
 
 std::unique_ptr<ui_devtools::protocol::DOM::Node>
-UIDevToolsDOMAgent::BuildTreeForUIElement(UIElement* ui_element) {
+DOMAgent::BuildTreeForUIElement(UIElement* ui_element) {
   if (ui_element->type() == UIElementType::WINDOW) {
     return BuildTreeForWindow(
         ui_element,
@@ -836,7 +830,7 @@ UIDevToolsDOMAgent::BuildTreeForUIElement(UIElement* ui_element) {
   return nullptr;
 }
 
-std::unique_ptr<DOM::Node> UIDevToolsDOMAgent::BuildTreeForWindow(
+std::unique_ptr<DOM::Node> DOMAgent::BuildTreeForWindow(
     UIElement* window_element_root,
     aura::Window* window) {
   std::unique_ptr<Array<DOM::Node>> children = Array<DOM::Node>::create();
@@ -861,7 +855,7 @@ std::unique_ptr<DOM::Node> UIDevToolsDOMAgent::BuildTreeForWindow(
   return node;
 }
 
-std::unique_ptr<DOM::Node> UIDevToolsDOMAgent::BuildTreeForRootWidget(
+std::unique_ptr<DOM::Node> DOMAgent::BuildTreeForRootWidget(
     UIElement* widget_element,
     views::Widget* widget) {
   std::unique_ptr<Array<DOM::Node>> children = Array<DOM::Node>::create();
@@ -878,9 +872,8 @@ std::unique_ptr<DOM::Node> UIDevToolsDOMAgent::BuildTreeForRootWidget(
   return node;
 }
 
-std::unique_ptr<DOM::Node> UIDevToolsDOMAgent::BuildTreeForView(
-    UIElement* view_element,
-    views::View* view) {
+std::unique_ptr<DOM::Node> DOMAgent::BuildTreeForView(UIElement* view_element,
+                                                      views::View* view) {
   std::unique_ptr<Array<DOM::Node>> children = Array<DOM::Node>::create();
 
   for (auto* child : view->GetChildrenInZOrder()) {
@@ -895,14 +888,14 @@ std::unique_ptr<DOM::Node> UIDevToolsDOMAgent::BuildTreeForView(
   return node;
 }
 
-void UIDevToolsDOMAgent::RemoveDomNode(UIElement* ui_element) {
+void DOMAgent::RemoveDomNode(UIElement* ui_element) {
   for (auto* child_element : ui_element->children())
     RemoveDomNode(child_element);
   frontend()->childNodeRemoved(ui_element->parent()->node_id(),
                                ui_element->node_id());
 }
 
-void UIDevToolsDOMAgent::Reset() {
+void DOMAgent::Reset() {
   is_building_tree_ = false;
   render_text_.reset();
   layer_for_highlighting_.reset();
@@ -911,7 +904,7 @@ void UIDevToolsDOMAgent::Reset() {
   observers_.Clear();
 }
 
-void UIDevToolsDOMAgent::UpdateHighlight(
+void DOMAgent::UpdateHighlight(
     const std::pair<aura::Window*, gfx::Rect>& window_and_bounds) {
   display::Display display =
       display::Screen::GetScreen()->GetDisplayNearestWindow(

components/ui_devtools/views/ui_devtools_dom_agent.h → components/ui_devtools/views/dom_agent.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_UI_DEVTOOLS_VIEWS_UI_DEVTOOLS_DOM_AGENT_H_
-#define COMPONENTS_UI_DEVTOOLS_VIEWS_UI_DEVTOOLS_DOM_AGENT_H_
+#ifndef COMPONENTS_UI_DEVTOOLS_VIEWS_DOM_AGENT_H_
+#define COMPONENTS_UI_DEVTOOLS_VIEWS_DOM_AGENT_H_
 
 #include "components/ui_devtools/DOM.h"
 #include "components/ui_devtools/devtools_base_agent.h"
@@ -38,19 +38,19 @@ enum RectSide { TOP_SIDE, LEFT_SIDE, RIGHT_SIDE, BOTTOM_SIDE };
 
 class UIElement;
 
-class UIDevToolsDOMAgentObserver {
+class DOMAgentObserver {
  public:
   virtual void OnElementBoundsChanged(UIElement* ui_element) = 0;
 };
 
-class UIDevToolsDOMAgent : public ui_devtools::UiDevToolsBaseAgent<
-                               ui_devtools::protocol::DOM::Metainfo>,
-                           public UIElementDelegate,
-                           public aura::EnvObserver,
-                           public ui::LayerDelegate {
+class DOMAgent : public ui_devtools::UiDevToolsBaseAgent<
+                     ui_devtools::protocol::DOM::Metainfo>,
+                 public UIElementDelegate,
+                 public aura::EnvObserver,
+                 public ui::LayerDelegate {
  public:
-  UIDevToolsDOMAgent();
-  ~UIDevToolsDOMAgent() override;
+  DOMAgent();
+  ~DOMAgent() override;
 
   // DOM::Backend:
   ui_devtools::protocol::Response disable() override;
@@ -67,8 +67,8 @@ class UIDevToolsDOMAgent : public ui_devtools::UiDevToolsBaseAgent<
   void OnUIElementRemoved(UIElement* ui_element) override;
   void OnUIElementBoundsChanged(UIElement* ui_element) override;
 
-  void AddObserver(UIDevToolsDOMAgentObserver* observer);
-  void RemoveObserver(UIDevToolsDOMAgentObserver* observer);
+  void AddObserver(DOMAgentObserver* observer);
+  void RemoveObserver(DOMAgentObserver* observer);
   UIElement* GetElementFromNodeId(int node_id);
   UIElement* window_element_root() const { return window_element_root_.get(); };
   const std::vector<aura::Window*>& root_windows() const {
@@ -139,11 +139,11 @@ class UIDevToolsDOMAgent : public ui_devtools::UiDevToolsBaseAgent<
   std::vector<aura::Window*> root_windows_;
   gfx::Rect hovered_rect_;
   gfx::Rect pinned_rect_;
-  base::ObserverList<UIDevToolsDOMAgentObserver> observers_;
+  base::ObserverList<DOMAgentObserver> observers_;
 
-  DISALLOW_COPY_AND_ASSIGN(UIDevToolsDOMAgent);
+  DISALLOW_COPY_AND_ASSIGN(DOMAgent);
 };
 
 }  // namespace ui_devtools
 
-#endif  // COMPONENTS_UI_DEVTOOLS_VIEWS_UI_DEVTOOLS_DOM_AGENT_H_
+#endif  // COMPONENTS_UI_DEVTOOLS_VIEWS_UI_DOM_AGENT_H_

components/ui_devtools/views/ui_devtools_overlay_agent.cc

@@ -9,7 +9,7 @@
 
 namespace ui_devtools {
 
-UIDevToolsOverlayAgent::UIDevToolsOverlayAgent(UIDevToolsDOMAgent* dom_agent)
+UIDevToolsOverlayAgent::UIDevToolsOverlayAgent(DOMAgent* dom_agent)
     : dom_agent_(dom_agent) {
   DCHECK(dom_agent_);
 }

components/ui_devtools/views/ui_devtools_overlay_agent.h

@@ -6,7 +6,7 @@
 #define COMPONENTS_UI_DEVTOOLS_VIEWS_UI_DEVTOOLS_OVERLAY_AGENT_H_
 
 #include "components/ui_devtools/Overlay.h"
-#include "components/ui_devtools/views/ui_devtools_dom_agent.h"
+#include "components/ui_devtools/views/dom_agent.h"
 #include "ui/events/event_handler.h"
 
 namespace ui_devtools {
@@ -15,7 +15,7 @@ class UIDevToolsOverlayAgent : public ui_devtools::UiDevToolsBaseAgent<
                                    ui_devtools::protocol::Overlay::Metainfo>,
                                public ui::EventHandler {
  public:
-  explicit UIDevToolsOverlayAgent(UIDevToolsDOMAgent* dom_agent);
+  explicit UIDevToolsOverlayAgent(DOMAgent* dom_agent);
   ~UIDevToolsOverlayAgent() override;
   int pinned_id() const { return pinned_id_; };
   void SetPinnedNodeId(int pinned_id);
@@ -36,7 +36,7 @@ class UIDevToolsOverlayAgent : public ui_devtools::UiDevToolsBaseAgent<
   void OnMouseEvent(ui::MouseEvent* event) override;
   void OnKeyEvent(ui::KeyEvent* event) override;
 
-  UIDevToolsDOMAgent* const dom_agent_;
+  DOMAgent* const dom_agent_;
   int pinned_id_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(UIDevToolsOverlayAgent);

components/ui_devtools/views/ui_devtools_unittest.cc

@@ -6,7 +6,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/ui_devtools/views/css_agent.h"
-#include "components/ui_devtools/views/ui_devtools_dom_agent.h"
+#include "components/ui_devtools/views/dom_agent.h"
 #include "components/ui_devtools/views/ui_devtools_overlay_agent.h"
 #include "components/ui_devtools/views/ui_element.h"
 #include "components/ui_devtools/views/view_element.h"
@@ -224,7 +224,7 @@ class UIDevToolsTest : public views::ViewsTestBase {
     fake_frontend_channel_ = base::MakeUnique<FakeFrontendChannel>();
     uber_dispatcher_ =
         base::MakeUnique<UberDispatcher>(fake_frontend_channel_.get());
-    dom_agent_ = base::MakeUnique<ui_devtools::UIDevToolsDOMAgent>();
+    dom_agent_ = base::MakeUnique<ui_devtools::DOMAgent>();
     dom_agent_->Init(uber_dispatcher_.get());
     css_agent_ = base::MakeUnique<ui_devtools::CSSAgent>(dom_agent_.get());
     css_agent_->Init(uber_dispatcher_.get());
@@ -363,7 +363,7 @@ class UIDevToolsTest : public views::ViewsTestBase {
   }
 
   ui_devtools::CSSAgent* css_agent() { return css_agent_.get(); }
-  ui_devtools::UIDevToolsDOMAgent* dom_agent() { return dom_agent_.get(); }
+  ui_devtools::DOMAgent* dom_agent() { return dom_agent_.get(); }
   ui_devtools::UIDevToolsOverlayAgent* overlay_agent() {
     return overlay_agent_.get();
   }
@@ -375,7 +375,7 @@ class UIDevToolsTest : public views::ViewsTestBase {
  private:
   std::unique_ptr<UberDispatcher> uber_dispatcher_;
   std::unique_ptr<FakeFrontendChannel> fake_frontend_channel_;
-  std::unique_ptr<ui_devtools::UIDevToolsDOMAgent> dom_agent_;
+  std::unique_ptr<ui_devtools::DOMAgent> dom_agent_;
   std::unique_ptr<ui_devtools::CSSAgent> css_agent_;
   std::unique_ptr<ui_devtools::UIDevToolsOverlayAgent> overlay_agent_;