Replace WmWindowObserver with aura::WindowObserver.

ash/common/wm/panels/panel_layout_manager.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/panels/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/window_parenting_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
+#include "ash/wm/window_properties.h"
 #include "base/auto_reset.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/views/background.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 319 matching lines @@
     wm::ReparentTransientChildrenOfChild(child, old_parent, child->GetParent());
     DCHECK(child->GetParent()->GetShellWindowId() !=
            kShellWindowId_PanelContainer);
     return;
   }
   PanelInfo panel_info;
   panel_info.window = child;
   panel_info.callout_widget = new PanelCalloutWidget(panel_container_);
   panel_info.slide_in = child != dragged_panel_;
   panel_windows_.push_back(panel_info);
-  child->AddObserver(this);
+  child->aura_window()->AddObserver(this);
   child->GetWindowState()->AddObserver(this);
   Relayout();
 }
 
 void PanelLayoutManager::OnWillRemoveWindowFromLayout(WmWindow* child) {}
 
 void PanelLayoutManager::OnWindowRemovedFromLayout(WmWindow* child) {
   if (child->GetType() == ui::wm::WINDOW_TYPE_POPUP)
     return;
 
   PanelList::iterator found =
       std::find(panel_windows_.begin(), panel_windows_.end(), child);
   if (found != panel_windows_.end()) {
     delete found->callout_widget;
     panel_windows_.erase(found);
   }
   if (restore_windows_on_shelf_visible_)
-    restore_windows_on_shelf_visible_->Remove(child);
-  child->RemoveObserver(this);
+    restore_windows_on_shelf_visible_->Remove(child->aura_window());
+  child->aura_window()->RemoveObserver(this);
   child->GetWindowState()->RemoveObserver(this);
 
   if (dragged_panel_ == child)
     dragged_panel_ = NULL;
 
   if (last_active_panel_ == child)
     last_active_panel_ = NULL;
 
   Relayout();
 }
@@ skipping 53 matching lines @@
 }
 
 void PanelLayoutManager::OnShelfAlignmentChanged(WmWindow* root_window) {
   if (root_window_controller_->GetWindow() == root_window)
     Relayout();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager, WindowObserver implementation:
 
-void PanelLayoutManager::OnWindowPropertyChanged(WmWindow* window,
-                                                 WmWindowProperty property) {
+void PanelLayoutManager::OnWindowPropertyChanged(aura::Window* window,
+                                                 const void* key,
+                                                 intptr_t old) {
   // Trigger a relayout to position the panels whenever the panel icon is set
   // or changes.
-  if (property == WmWindowProperty::SHELF_ID)
+  if (key == kShelfIDKey)
     Relayout();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager, WindowStateObserver implementation:
 
 void PanelLayoutManager::OnPostWindowStateTypeChange(
     wm::WindowState* window_state,
     wm::WindowStateType old_type) {
   // If the shelf is currently hidden then windows will not actually be shown
   // but the set to restore when the shelf becomes visible is updated.
   if (restore_windows_on_shelf_visible_) {
     if (window_state->IsMinimized()) {
       MinimizePanel(window_state->window());
-      restore_windows_on_shelf_visible_->Remove(window_state->window());
+      restore_windows_on_shelf_visible_->Remove(
+          window_state->window()->aura_window());
     } else {
-      restore_windows_on_shelf_visible_->Add(window_state->window());
+      restore_windows_on_shelf_visible_->Add(
+          window_state->window()->aura_window());
     }
     return;
   }
 
   if (window_state->IsMinimized())
     MinimizePanel(window_state->window());
   else
     RestorePanel(window_state->window());
 }
 
@@ skipping 21 matching lines @@
 // PanelLayoutManager, ShelfLayoutManagerObserver implementation:
 
 void PanelLayoutManager::WillChangeVisibilityState(
     ShelfVisibilityState new_state) {
   // On entering / leaving full screen mode the shelf visibility state is
   // changed to / from SHELF_HIDDEN. In this state, panel windows should hide
   // to allow the full-screen application to use the full screen.
   bool shelf_hidden = new_state == ash::SHELF_HIDDEN;
   if (!shelf_hidden) {
     if (restore_windows_on_shelf_visible_) {
-      std::unique_ptr<WmWindowTracker> restore_windows(
+      std::unique_ptr<aura::WindowTracker> restore_windows(
           std::move(restore_windows_on_shelf_visible_));
-      for (WmWindow* window : restore_windows->windows())
-        RestorePanel(window);
+      for (aura::Window* window : restore_windows->windows())
+        RestorePanel(WmWindow::Get(window));
     }
     return;
   }
 
   if (restore_windows_on_shelf_visible_)
     return;
-  std::unique_ptr<WmWindowTracker> minimized_windows(new WmWindowTracker);
+  std::unique_ptr<aura::WindowTracker> minimized_windows(
+      new aura::WindowTracker);
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end();) {
     WmWindow* window = iter->window;
     // Minimizing a panel window may remove it from the panel_windows_ list.
     // Advance the iterator before minimizing it: http://crbug.com/393047.
     ++iter;
     if (window != dragged_panel_ && window->IsVisible()) {
-      minimized_windows->Add(window);
+      minimized_windows->Add(window->aura_window());
       window->GetWindowState()->Minimize();
     }
   }
   restore_windows_on_shelf_visible_ = std::move(minimized_windows);
 }
 
 void PanelLayoutManager::OnShelfIconPositionsChanged() {
   // TODO: As this is called for every animation step now. Relayout needs to be
   // updated to use current icon position instead of use the ideal bounds so
   // that the panels slide with their icons instead of jumping.
@@ skipping 75 matching lines @@
          !BoundsAdjacent(panel->GetBounds(), shelf_bounds))) {
       continue;
     }
 
     // If the shelf is currently hidden (full-screen mode), minimize panel until
     // full-screen mode is exited. When a panel is dragged from another display
     // the shelf state does not update before the panel is added so we exclude
     // the dragged panel.
     if (panel != dragged_panel_ && restore_windows_on_shelf_visible_) {
       panel->GetWindowState()->Minimize();
-      restore_windows_on_shelf_visible_->Add(panel);
+      restore_windows_on_shelf_visible_->Add(panel->aura_window());
       continue;
     }
 
     gfx::Rect icon_bounds = shelf_->GetScreenBoundsOfItemIconForWindow(panel);
 
     // If both the icon width and height are 0 then there is no icon in the
     // shelf. If the shelf is hidden, one of the height or width will be
     // 0 but the position in the shelf and major dimension is still reported
     // correctly and the panel can be aligned above where the hidden icon is.
     if (icon_bounds.width() == 0 && icon_bounds.height() == 0)
@@ skipping 273 matching lines @@
     }
   }
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 void PanelLayoutManager::OnKeyboardClosed() {}
 
 }  // namespace ash