Remove ash dependency.

ash/devtools/ash_devtools_dom_agent.cc

 // 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.
 
 #include "ash/devtools/ash_devtools_dom_agent.h"
 
 #include "ash/devtools/ui_element.h"
 #include "ash/devtools/view_element.h"
 #include "ash/devtools/widget_element.h"
 #include "ash/devtools/window_element.h"
 #include "ash/public/cpp/shell_window_ids.h"
-#include "ash/root_window_controller.h"
-#include "ash/shell.h"
 #include "components/ui_devtools/devtools_server.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/aura/client/screen_position_client.h"
+#include "ui/aura/env.h"
 #include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
 #include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 namespace devtools {
 namespace {
 
@@ skipping 81 matching lines @@
                                         .setNodeType(kDomElementNodeType)
                                         .setAttributes(GetAttributes(root))
                                         .build();
   node->setChildNodeCount(children->length());
   node->setChildren(std::move(children));
   return node;
 }
 
 }  // namespace
 
-AshDevToolsDOMAgent::AshDevToolsDOMAgent() : is_building_tree_(false) {}
+AshDevToolsDOMAgent::AshDevToolsDOMAgent() : is_building_tree_(false) {
+  aura::Env::GetInstance()->AddObserver(this);
+}
 
 AshDevToolsDOMAgent::~AshDevToolsDOMAgent() {
+  aura::Env::GetInstance()->RemoveObserver(this);
   Reset();
 }
 
 ui::devtools::protocol::Response AshDevToolsDOMAgent::disable() {
   Reset();
   return ui::devtools::protocol::Response::OK();
 }
 
 ui::devtools::protocol::Response AshDevToolsDOMAgent::getDocument(
     std::unique_ptr<ui::devtools::protocol::DOM::Node>* out_root) {
@@ skipping 70 matching lines @@
 
 void AshDevToolsDOMAgent::RemoveObserver(
     AshDevToolsDOMAgentObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 UIElement* AshDevToolsDOMAgent::GetElementFromNodeId(int node_id) {
   return node_id_to_ui_element_[node_id];
 }
 
+void AshDevToolsDOMAgent::OnHostInitialized(aura::WindowTreeHost* host) {
+  root_windows_.push_back(host->window());
+}
+
 void AshDevToolsDOMAgent::OnNodeBoundsChanged(int node_id) {
   for (auto& observer : observers_)
     observer.OnNodeBoundsChanged(node_id);
 }
 
 std::unique_ptr<ui::devtools::protocol::DOM::Node>
 AshDevToolsDOMAgent::BuildInitialTree() {
   is_building_tree_ = true;
   std::unique_ptr<Array<DOM::Node>> children = Array<DOM::Node>::create();
 
   // TODO(thanhph): Root of UIElement tree shoudn't be WindowElement
   // but maybe a new different element type.
   window_element_root_ =
       base::MakeUnique<WindowElement>(nullptr, this, nullptr);
 
-  for (aura::Window* window : Shell::GetAllRootWindows()) {
+  for (aura::Window* window : root_windows()) {
     UIElement* window_element =
         new WindowElement(window, this, window_element_root_.get());
 
     children->addItem(BuildTreeForUIElement(window_element));
     window_element_root_->AddChild(window_element);
   }
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root_node = BuildNode(
       "root", nullptr, std::move(children), window_element_root_->node_id());
   is_building_tree_ = false;
   return root_node;
@@ skipping 93 matching lines @@
 
 void AshDevToolsDOMAgent::InitializeHighlightingWidget() {
   DCHECK(!widget_for_highlighting_);
   widget_for_highlighting_.reset(new views::Widget);
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.opacity = views::Widget::InitParams::WindowOpacity::TRANSLUCENT_WINDOW;
   params.name = "HighlightingWidget";
-  Shell::GetPrimaryRootWindowController()
-      ->ConfigureWidgetInitParamsForContainer(widget_for_highlighting_.get(),
-                                              kShellWindowId_OverlayContainer,
-                                              &params);
+  params.parent = nullptr;

[sadrul, 2017/05/29 16:48:45]

Don't need to set this.

   params.keep_on_top = true;
   params.accept_events = false;
   widget_for_highlighting_->Init(params);
 }
 
 void AshDevToolsDOMAgent::UpdateHighlight(
     const std::pair<aura::Window*, gfx::Rect>& window_and_bounds,
     SkColor background,
     SkColor border) {
   constexpr int kBorderThickness = 1;
   views::View* root_view = widget_for_highlighting_->GetRootView();
   root_view->SetBorder(views::CreateSolidBorder(kBorderThickness, border));
   root_view->set_background(
       views::Background::CreateSolidBackground(background));
   display::Display display =
       display::Screen::GetScreen()->GetDisplayNearestWindow(
           window_and_bounds.first);
-  widget_for_highlighting_->GetNativeWindow()->SetBoundsInScreen(
-      window_and_bounds.second, display);
+  aura::Window* root = window_and_bounds.first->GetRootWindow();
+  if (root != widget_for_highlighting_->GetNativeWindow()->GetRootWindow())
+    root->AddChild(widget_for_highlighting_->GetNativeWindow());
+
+  aura::client::ScreenPositionClient* screen_position_client =
+      aura::client::GetScreenPositionClient(
+          window_and_bounds.first->GetRootWindow());

[sadrul, 2017/05/29 16:48:45]

Use |root|

+
+  gfx::Rect bounds(window_and_bounds.second);
+  gfx::Point origin = bounds.origin();
+  screen_position_client->ConvertPointFromScreen(root, &origin);
+  bounds.set_origin(origin);
+  widget_for_highlighting_->GetNativeWindow()->SetBounds(bounds);
 }
 
 ui::devtools::protocol::Response AshDevToolsDOMAgent::HighlightNode(
     std::unique_ptr<ui::devtools::protocol::DOM::HighlightConfig>
         highlight_config,
     int node_id) {
   if (!widget_for_highlighting_)
     InitializeHighlightingWidget();
 
   std::pair<aura::Window*, gfx::Rect> window_and_bounds =
@@ skipping 12 matching lines @@
   UpdateHighlight(window_and_bounds, content_color, border_color);
 
   if (!widget_for_highlighting_->IsVisible())
     widget_for_highlighting_->Show();
 
   return ui::devtools::protocol::Response::OK();
 }
 
 }  // namespace devtools
 }  // namespace ash