Replace WmWindowObserver with aura::WindowObserver.

ash/common/test/test_shelf_delegate.cc

 // Copyright 2013 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/test/test_shelf_delegate.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/test/test_shelf_item_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
 #include "ash/root_window_controller.h"
 #include "base/memory/ptr_util.h"
+#include "ui/aura/window.h"
 
 namespace ash {
 namespace test {
 
 TestShelfDelegate* TestShelfDelegate::instance_ = nullptr;
 
 // A ShellObserver that sets the shelf alignment and auto hide behavior when the
 // shelf is created, to simulate ChromeLauncherController's behavior.
 class ShelfInitializer : public ShellObserver {
  public:
@@ skipping 40 matching lines @@
 void TestShelfDelegate::AddShelfItem(WmWindow* window, ShelfItemStatus status) {
   ShelfItem item;
   if (window->GetType() == ui::wm::WINDOW_TYPE_PANEL)
     item.type = TYPE_APP_PANEL;
   else
     item.type = TYPE_APP;
   ShelfModel* model = WmShell::Get()->shelf_model();
   ShelfID id = model->next_id();
   item.status = status;
   model->Add(item);
-  window->AddObserver(this);
+  window->aura_window()->AddObserver(this);
 
   model->SetShelfItemDelegate(id,
                               base::MakeUnique<TestShelfItemDelegate>(window));
   window->SetIntProperty(WmWindowProperty::SHELF_ID, id);
 }
 
 void TestShelfDelegate::RemoveShelfItemForWindow(WmWindow* window) {
   ShelfID shelf_id = window->GetIntProperty(WmWindowProperty::SHELF_ID);
   if (shelf_id == 0)
     return;
   ShelfModel* model = WmShell::Get()->shelf_model();
   int index = model->ItemIndexByID(shelf_id);
   DCHECK_NE(-1, index);
   model->RemoveItemAt(index);
-  window->RemoveObserver(this);
+  window->aura_window()->RemoveObserver(this);
   if (HasShelfIDToAppIDMapping(shelf_id)) {
     const std::string& app_id = GetAppIDForShelfID(shelf_id);
     if (IsAppPinned(app_id))
       UnpinAppWithID(app_id);
     if (HasShelfIDToAppIDMapping(shelf_id))
       RemoveShelfIDToAppIDMapping(shelf_id);
   }
 }
 
-void TestShelfDelegate::OnWindowDestroying(WmWindow* window) {
-  RemoveShelfItemForWindow(window);
+void TestShelfDelegate::OnWindowDestroying(aura::Window* window) {
+  RemoveShelfItemForWindow(WmWindow::Get(window));
 }
 
-void TestShelfDelegate::OnWindowTreeChanging(WmWindow* window,
-                                             const TreeChangeParams& params) {
+void TestShelfDelegate::OnWindowHierarchyChanging(
+    const HierarchyChangeParams& params) {
   // The window may be legitimately reparented while staying open if it moves
   // to another display or container. If the window does not have a new parent
   // then remove the shelf item.
   if (!params.new_parent)
-    RemoveShelfItemForWindow(params.target);
+    RemoveShelfItemForWindow(WmWindow::Get(params.target));
 }
 
 ShelfID TestShelfDelegate::GetShelfIDForAppID(const std::string& app_id) {
   for (auto const& iter : shelf_id_to_app_id_map_) {
     if (iter.second == app_id)
       return iter.first;
   }
   return 0;
 }
 
@@ skipping 28 matching lines @@
                                                  const std::string& app_id) {
   shelf_id_to_app_id_map_[shelf_id] = app_id;
 }
 
 void TestShelfDelegate::RemoveShelfIDToAppIDMapping(ShelfID shelf_id) {
   shelf_id_to_app_id_map_.erase(shelf_id);
 }
 
 }  // namespace test
 }  // namespace ash