Replace WmWindowObserver with aura::WindowObserver.

ash/common/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/common/devtools/ash_devtools_dom_agent.h"
 
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
@@ skipping 120 matching lines @@
   return HighlightNode(std::move(highlight_config), node_id.fromJust());
 }
 
 ui::devtools::protocol::Response AshDevToolsDOMAgent::hideHighlight() {
   if (widget_for_highlighting_ && widget_for_highlighting_->IsVisible())
     widget_for_highlighting_->Hide();
   return ui::devtools::protocol::Response::OK();
 }
 
 // Handles removing windows.
-void AshDevToolsDOMAgent::OnWindowTreeChanging(WmWindow* window,
-                                               const TreeChangeParams& params) {
-  // Only trigger this when window == params.old_parent.
+void AshDevToolsDOMAgent::OnWindowHierarchyChanging(
+    const HierarchyChangeParams& params) {
+  // Only trigger this when params.receiver == params.old_parent.
   // Only removals are handled here. Removing a node can occur as a result of
-  // reorganizing a window or just destroying it. OnWindowTreeChanged
+  // reorganizing a window or just destroying it. OnWindowHierarchyChanged
   // is only called if there is a new_parent. The only case this method isn't
   // called is when adding a node because old_parent is then null.
   // Finally, We only trigger this  0 or 1 times as an old_parent will
   // either exist and only call this callback once, or not at all.
-  if (window == params.old_parent)
-    RemoveWindowTree(params.target, true);
+  if (params.receiver == params.old_parent)
+    RemoveWindowTree(WmWindow::Get(params.target), true);
 }
 
 // Handles adding windows.
-void AshDevToolsDOMAgent::OnWindowTreeChanged(WmWindow* window,
-                                              const TreeChangeParams& params) {
-  // Only trigger this when window == params.new_parent.
+void AshDevToolsDOMAgent::OnWindowHierarchyChanged(
+    const HierarchyChangeParams& params) {
+  // Only trigger this when params.receiver == params.new_parent.
   // If there is an old_parent + new_parent, then this window's node was
-  // removed in OnWindowTreeChanging and will now be added to the new_parent.
-  // If there is only a new_parent, OnWindowTreeChanging is never called and
-  // the window is only added here.
-  if (window == params.new_parent)
-    AddWindowTree(params.target);
+  // removed in OnWindowHierarchyChanging and will now be added to the
+  // new_parent. If there is only a new_parent, OnWindowHierarchyChanging is
+  // never called and the window is only added here.
+  if (params.receiver == params.new_parent)
+    AddWindowTree(WmWindow::Get(params.target));
 }
 
-void AshDevToolsDOMAgent::OnWindowStackingChanged(WmWindow* window) {
-  RemoveWindowTree(window, false);
-  AddWindowTree(window);
+void AshDevToolsDOMAgent::OnWindowStackingChanged(aura::Window* window) {
+  RemoveWindowTree(WmWindow::Get(window), false);
+  AddWindowTree(WmWindow::Get(window));
 }
 
-void AshDevToolsDOMAgent::OnWindowBoundsChanged(WmWindow* window,
+void AshDevToolsDOMAgent::OnWindowBoundsChanged(aura::Window* window,
                                                 const gfx::Rect& old_bounds,
                                                 const gfx::Rect& new_bounds) {
   for (auto& observer : observers_)
-    observer.OnWindowBoundsChanged(window);
+    observer.OnWindowBoundsChanged(WmWindow::Get(window));
 }
 
 void AshDevToolsDOMAgent::OnWillRemoveView(views::Widget* widget,
                                            views::View* view) {
   if (view == widget->GetRootView())
     RemoveViewTree(view, nullptr, true);
 }
 
 void AshDevToolsDOMAgent::OnWidgetBoundsChanged(views::Widget* widget,
                                                 const gfx::Rect& new_bounds) {
@@ skipping 74 matching lines @@
   views::Widget* widget = GetWidgetFromWmWindow(window);
   if (widget)
     children->addItem(BuildTreeForRootWidget(widget));
   for (ash::WmWindow* child : window->GetChildren()) {
     if (!IsHighlightingWindow(child))
       children->addItem(BuildTreeForWindow(child));
   }
 
   std::unique_ptr<ui::devtools::protocol::DOM::Node> node =
       BuildNode("Window", GetAttributes(window), std::move(children));
-  if (!window->HasObserver(this))
-    window->AddObserver(this);
+  if (!window->aura_window()->HasObserver(this))
+    window->aura_window()->AddObserver(this);
   window_to_node_id_map_[window] = node->getNodeId();
   node_id_to_window_map_[node->getNodeId()] = window;
   return node;
 }
 
 std::unique_ptr<DOM::Node> AshDevToolsDOMAgent::BuildTreeForRootWidget(
     views::Widget* widget) {
   DCHECK(!widget_to_node_id_map_.count(widget));
   std::unique_ptr<Array<DOM::Node>> children = Array<DOM::Node>::create();
   children->addItem(BuildTreeForView(widget->GetRootView()));
@@ skipping 55 matching lines @@
   DCHECK(window_to_node_id_it != window_to_node_id_map_.end());
 
   int node_id = window_to_node_id_it->second;
   int parent_id = GetNodeIdFromWindow(window->GetParent());
 
   NodeIdToWindowMap::iterator node_id_to_window_it =
       node_id_to_window_map_.find(node_id);
   DCHECK(node_id_to_window_it != node_id_to_window_map_.end());
 
   if (remove_observer)
-    window->RemoveObserver(this);
+    window->aura_window()->RemoveObserver(this);
 
   node_id_to_window_map_.erase(node_id_to_window_it);
   window_to_node_id_map_.erase(window_to_node_id_it);
   frontend()->childNodeRemoved(parent_id, node_id);
 }
 
 void AshDevToolsDOMAgent::RemoveWidgetTree(views::Widget* widget,
                                            bool remove_observer) {
   DCHECK(widget);
   if (widget->GetRootView())
@@ skipping 62 matching lines @@
       node_id_to_view_map_.find(node_id);
   DCHECK(node_id_to_view_it != node_id_to_view_map_.end());
 
   view_to_node_id_map_.erase(view_to_node_id_it);
   node_id_to_view_map_.erase(node_id_to_view_it);
   frontend()->childNodeRemoved(parent_id, node_id);
 }
 
 void AshDevToolsDOMAgent::RemoveObservers() {
   for (auto& pair : window_to_node_id_map_)
-    pair.first->RemoveObserver(this);
+    pair.first->aura_window()->RemoveObserver(this);
   for (auto& pair : widget_to_node_id_map_)
     pair.first->RemoveRemovalsObserver(this);
   for (auto& pair : view_to_node_id_map_)
     pair.first->RemoveObserver(this);
 }
 
 void AshDevToolsDOMAgent::Reset() {
   RemoveObservers();
   widget_for_highlighting_.reset();
   window_to_node_id_map_.clear();
@@ skipping 85 matching lines @@
   return ui::devtools::protocol::Response::OK();
 }
 
 bool AshDevToolsDOMAgent::IsHighlightingWindow(WmWindow* window) {
   return widget_for_highlighting_ &&
          GetWidgetFromWmWindow(window) == widget_for_highlighting_.get();
 }
 
 }  // namespace devtools
 }  // namespace ash