Replace WmWindowObserver with aura::WindowObserver.

ash/common/wm/always_on_top_controller.cc

 // Copyright (c) 2012 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/wm/always_on_top_controller.h"
 
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/memory/ptr_util.h"
+#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window.h"
 
 namespace ash {
 
 AlwaysOnTopController::AlwaysOnTopController(WmWindow* viewport)
     : always_on_top_container_(viewport) {
   DCHECK_NE(kShellWindowId_DefaultContainer, viewport->GetShellWindowId());
   always_on_top_container_->SetLayoutManager(
       base::MakeUnique<WorkspaceLayoutManager>(viewport));
   // Container should be empty.
   DCHECK(always_on_top_container_->GetChildren().empty());
-  always_on_top_container_->AddObserver(this);
+  always_on_top_container_->aura_window()->AddObserver(this);
 }
 
 AlwaysOnTopController::~AlwaysOnTopController() {
   if (always_on_top_container_)
-    always_on_top_container_->RemoveObserver(this);
+    always_on_top_container_->aura_window()->RemoveObserver(this);
 }
 
 WmWindow* AlwaysOnTopController::GetContainer(WmWindow* window) const {
   DCHECK(always_on_top_container_);
   if (window->GetBoolProperty(WmWindowProperty::ALWAYS_ON_TOP))
     return always_on_top_container_;
   return always_on_top_container_->GetRootWindow()->GetChildByShellWindowId(
       kShellWindowId_DefaultContainer);
 }
 
 // TODO(rsadam@): Refactor so that this cast is unneeded.
 WorkspaceLayoutManager* AlwaysOnTopController::GetLayoutManager() const {
   return static_cast<WorkspaceLayoutManager*>(
       always_on_top_container_->GetLayoutManager());
 }
 
 void AlwaysOnTopController::SetLayoutManagerForTest(
     std::unique_ptr<WorkspaceLayoutManager> layout_manager) {
   always_on_top_container_->SetLayoutManager(std::move(layout_manager));
 }
 
-void AlwaysOnTopController::OnWindowTreeChanged(
-    WmWindow* window,
-    const TreeChangeParams& params) {
-  if (params.old_parent == always_on_top_container_)
+void AlwaysOnTopController::OnWindowHierarchyChanged(
+    const HierarchyChangeParams& params) {
+  if (WmWindow::Get(params.old_parent) == always_on_top_container_)
     params.target->RemoveObserver(this);
-  else if (params.new_parent == always_on_top_container_)
+  else if (WmWindow::Get(params.new_parent) == always_on_top_container_)
     params.target->AddObserver(this);
 }
 
-void AlwaysOnTopController::OnWindowPropertyChanged(WmWindow* window,
-                                                    WmWindowProperty property) {
-  if (window != always_on_top_container_ &&
-      property == WmWindowProperty::ALWAYS_ON_TOP) {
-    DCHECK(window->GetType() == ui::wm::WINDOW_TYPE_NORMAL ||
-           window->GetType() == ui::wm::WINDOW_TYPE_POPUP);
-    WmWindow* container = GetContainer(window);
-    if (window->GetParent() != container)
-      container->AddChild(window);
+void AlwaysOnTopController::OnWindowPropertyChanged(aura::Window* window,
+                                                    const void* key,
+                                                    intptr_t old) {
+  if (WmWindow::Get(window) != always_on_top_container_ &&
+      key == aura::client::kAlwaysOnTopKey) {
+    DCHECK(window->type() == ui::wm::WINDOW_TYPE_NORMAL ||
+           window->type() == ui::wm::WINDOW_TYPE_POPUP);
+    WmWindow* container = GetContainer(WmWindow::Get(window));
+    if (WmWindow::Get(window->parent()) != container)
+      container->AddChild(WmWindow::Get(window));
   }
 }
 
-void AlwaysOnTopController::OnWindowDestroying(WmWindow* window) {
-  if (window == always_on_top_container_) {
-    always_on_top_container_->RemoveObserver(this);
+void AlwaysOnTopController::OnWindowDestroying(aura::Window* window) {
+  if (WmWindow::Get(window) == always_on_top_container_) {
+    always_on_top_container_->aura_window()->RemoveObserver(this);
     always_on_top_container_ = nullptr;
   }
 }
 
 }  // namespace ash