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

ash/devtools/window_element.cc

Index: ash/devtools/window_element.cc
diff --git a/ash/devtools/window_element.cc b/ash/devtools/window_element.cc
new file mode 100644
index 0000000000000000000000000000000000000000..69f9eec8eb5a4b6f609abcb96d34e12c07725009
--- /dev/null
+++ b/ash/devtools/window_element.cc
@@ -0,0 +1,104 @@
+// Copyright 2017 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/window_element.h"
+
+#include "ash/devtools/ui_element_delegate.h"
+#include "ui/aura/window.h"
+
+namespace ash {
+namespace devtools {
+namespace {
+
+int GetIndexOfChildInParent(aura::Window* window) {
+  const aura::Window::Windows& siblings = window->parent()->children();
+  auto it = std::find(siblings.begin(), siblings.end(), window);
+  DCHECK(it != siblings.end());
+  return std::distance(siblings.begin(), it);
+}
+
+}  // namespace
+
+WindowElement::WindowElement(aura::Window* window,
+                             UIElementDelegate* ui_element_delegate,
+                             UIElement* parent)
+    : UIElement(UIElementType::WINDOW, ui_element_delegate, parent),
+      window_(window) {
+  if (window)
+    window_->AddObserver(this);
+}
+
+WindowElement::~WindowElement() {
+  if (window_)
+    window_->RemoveObserver(this);
+}
+
+// Handles removing window_.
+void WindowElement::OnWindowHierarchyChanging(
+    const aura::WindowObserver::HierarchyChangeParams& params) {
+  if (params.target == window_ && this->parent()->RemoveChild(this))
+    Destroy();
+}
+
+// Handles adding window_.
+void WindowElement::OnWindowHierarchyChanged(
+    const aura::WindowObserver::HierarchyChangeParams& params) {
+  if (window_ == params.new_parent && params.receiver == params.new_parent) {
+    AddChild(new WindowElement(params.target, delegate(), this),

[sadrul, 2017/05/10 03:03:38]

Can you check if |params.target| is the highlight window? i.e.:

  if (window_ == params.new_parent && window_ == params.receiver) {
    if (delegate()->IsHighlightingWindow(params.target))
      return;
    AddChild(....);
  }

This way, we make sure that we do not create any UIElement for the highlight
window at all. That should simplify OnUIElementRemoved() and
OnUIElementReordered(), where you would not need to check for
IsHighlightingWindow().

[thanhph, 2017/05/10 17:21:49]

Nice. I'm also able to turn bool UIElement::RemoveChild() to void function.

+             children().empty() ? nullptr : children().back());
+  }
+}
+
+void WindowElement::OnWindowStackingChanged(aura::Window* window) {
+  DCHECK_EQ(window_, window);
+  if (delegate()->IsHighlightingWindow(window))
+    return;
+  this->parent()->ReorderChild(this, GetIndexOfChildInParent(window));

[sadrul, 2017/05/10 03:03:38]

Don't need this->

[thanhph, 2017/05/10 17:21:49]

Done.

+}
+
+void WindowElement::OnWindowBoundsChanged(aura::Window* window,
+                                          const gfx::Rect& old_bounds,
+                                          const gfx::Rect& new_bounds) {
+  DCHECK_EQ(window_, window);
+  delegate()->OnUIElementBoundsChanged(this);
+}
+
+void WindowElement::Destroy() {
+  delete this;
+}
+
+void WindowElement::GetBounds(gfx::Rect* bounds) const {
+  *bounds = window_->bounds();
+}
+
+void WindowElement::SetBounds(const gfx::Rect& bounds) {
+  window_->SetBounds(bounds);
+}
+
+void WindowElement::GetVisible(bool* visible) const {
+  *visible = window_->IsVisible();
+}
+
+void WindowElement::SetVisible(bool visible) {
+  if (visible == window_->IsVisible())
+    return;
+  if (visible)
+    window_->Show();
+  else
+    window_->Hide();
+}
+
+std::pair<aura::Window*, gfx::Rect> WindowElement::GetNodeWindowAndBounds()
+    const {
+  return std::make_pair(window_, window_->GetBoundsInScreen());
+}
+
+// static
+aura::Window* WindowElement::From(UIElement* element) {
+  DCHECK_EQ(UIElementType::WINDOW, element->type());
+  return static_cast<WindowElement*>(element)->window_;
+}
+
+}  // namespace devtools
+}  // namespace ash