chromeos: converts PanelLayoutManager to aura::Window

ash/wm/always_on_top_controller.cc

Index: ash/wm/always_on_top_controller.cc
diff --git a/ash/wm/always_on_top_controller.cc b/ash/wm/always_on_top_controller.cc
index 7a0920f61ea9406ad2355ed530c91af7d434c519..56d940422905dc06be5bcaebb9ca80d3a93757b6 100644
--- a/ash/wm/always_on_top_controller.cc
+++ b/ash/wm/always_on_top_controller.cc
@@ -6,71 +6,69 @@
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
-#include "ash/wm_window.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 
-AlwaysOnTopController::AlwaysOnTopController(WmWindow* viewport)
+AlwaysOnTopController::AlwaysOnTopController(aura::Window* viewport)
     : always_on_top_container_(viewport) {
-  DCHECK_NE(kShellWindowId_DefaultContainer, viewport->aura_window()->id());
-  always_on_top_container_->aura_window()->SetLayoutManager(
-      new WorkspaceLayoutManager(viewport->aura_window()));
+  DCHECK_NE(kShellWindowId_DefaultContainer, viewport->id());
+  always_on_top_container_->SetLayoutManager(
+      new WorkspaceLayoutManager(viewport));
   // Container should be empty.
-  DCHECK(always_on_top_container_->GetChildren().empty());
-  always_on_top_container_->aura_window()->AddObserver(this);
+  DCHECK(always_on_top_container_->children().empty());
+  always_on_top_container_->AddObserver(this);
 }
 
 AlwaysOnTopController::~AlwaysOnTopController() {
   if (always_on_top_container_)
-    always_on_top_container_->aura_window()->RemoveObserver(this);
+    always_on_top_container_->RemoveObserver(this);
 }
 
-WmWindow* AlwaysOnTopController::GetContainer(WmWindow* window) const {
+aura::Window* AlwaysOnTopController::GetContainer(aura::Window* window) const {
   DCHECK(always_on_top_container_);
-  if (window->aura_window()->GetProperty(aura::client::kAlwaysOnTopKey))
+  if (window->GetProperty(aura::client::kAlwaysOnTopKey))
     return always_on_top_container_;
-  return always_on_top_container_->GetRootWindow()->GetChildByShellWindowId(
+  return always_on_top_container_->GetRootWindow()->GetChildById(
       kShellWindowId_DefaultContainer);
 }
 
 // TODO(rsadam@): Refactor so that this cast is unneeded.
 WorkspaceLayoutManager* AlwaysOnTopController::GetLayoutManager() const {
   return static_cast<WorkspaceLayoutManager*>(
-      always_on_top_container_->aura_window()->layout_manager());
+      always_on_top_container_->layout_manager());
 }
 
 void AlwaysOnTopController::SetLayoutManagerForTest(
     std::unique_ptr<WorkspaceLayoutManager> layout_manager) {
-  always_on_top_container_->aura_window()->SetLayoutManager(
-      layout_manager.release());
+  always_on_top_container_->SetLayoutManager(layout_manager.release());
 }
 
 void AlwaysOnTopController::OnWindowHierarchyChanged(
     const HierarchyChangeParams& params) {
-  if (WmWindow::Get(params.old_parent) == always_on_top_container_)
+  if (params.old_parent == always_on_top_container_)
     params.target->RemoveObserver(this);
-  else if (WmWindow::Get(params.new_parent) == always_on_top_container_)
+  else if (params.new_parent == always_on_top_container_)
     params.target->AddObserver(this);
 }
 
 void AlwaysOnTopController::OnWindowPropertyChanged(aura::Window* window,
                                                     const void* key,
                                                     intptr_t old) {
-  if (WmWindow::Get(window) != always_on_top_container_ &&
+  if (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));
+    aura::Window* container = GetContainer(window);
+    if (window->parent() != container)
+      container->AddChild(window);
   }
 }
 
 void AlwaysOnTopController::OnWindowDestroying(aura::Window* window) {
-  if (WmWindow::Get(window) == always_on_top_container_) {
-    always_on_top_container_->aura_window()->RemoveObserver(this);
+  if (window == always_on_top_container_) {
+    always_on_top_container_->RemoveObserver(this);
     always_on_top_container_ = nullptr;
   }
 }