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..bbb0103d3ce74cb9d6b35883f14e720780ae6239
--- /dev/null
+++ b/ash/devtools/window_element.cc
@@ -0,0 +1,109 @@
+// 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 FindSibling(aura::Window* window) {

[sadrul, 2017/05/09 04:58:07]

Call this: int GetIndexOfChildInParent(aura::Window* window)

[thanhph, 2017/05/09 20:52:47]

Done.

+  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_)

[sadrul, 2017/05/09 04:58:07]

|window_| should be non-null. You should not need to null-check here.

[thanhph, 2017/05/09 20:52:47]

For root ui_element tree, I assume associated window of the root is null so I
can't remove this, i.e., in AshDevToolsDOMAgent::BuildInitialTree(), I have this
line

window_element_root_ = new WindowElement(nullptr, this, nullptr); 

+    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_ && delegate()->OnUIElementRemoved(this)) {
+    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),
+             children().empty() ? nullptr : children().back());
+  }
+}
+
+void WindowElement::OnWindowStackingChanged(aura::Window* window) {
+  DCHECK(window_ == window);
+  if (delegate()->IsHighlightingWindow(window))
+    return;
+
+  this->parent()->RemoveChild(this);

[sadrul, 2017/05/09 04:58:07]

Don't need |this->|

Why do you need to RemoveChild() here? Just calling ReorderChild() should work?

[thanhph, 2017/05/09 20:52:47]

Done, I put this line in ReorderChild.

+  this->parent()->ReorderChild(this, FindSibling(window));
+  delegate()->OnUIElementReordered(this->parent(), this);

[sadrul, 2017/05/09 04:58:07]

UIElement::ReorderChild() should call OnUIElementReordered

[thanhph, 2017/05/09 20:52:47]

Done.

+}
+
+void WindowElement::OnWindowBoundsChanged(aura::Window* window,
+                                          const gfx::Rect& old_bounds,
+                                          const gfx::Rect& new_bounds) {
+  DCHECK(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()) {

[sadrul, 2017/05/09 04:58:07]

early return

[thanhph, 2017/05/09 20:52:47]

Done.

+    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