Replace WmWindowObserver with aura::WindowObserver.

ash/common/wm/overview/window_grid.cc

 // Copyright 2014 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/overview/window_grid.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/overview/cleanup_animation_observer.h"
 #include "ash/common/wm/overview/scoped_overview_animation_settings.h"
 #include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h"
 #include "ash/common/wm/overview/window_selector.h"
 #include "ash/common/wm/overview/window_selector_delegate.h"
 #include "ash/common/wm/overview/window_selector_item.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
+#include "ash/wm/window_state_aura.h"
 #include "base/command_line.h"
 #include "base/i18n/string_search.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/pathops/SkPathOps.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/canvas.h"
@@ skipping 245 matching lines @@
       selected_index_(0),
       num_columns_(0),
       prepared_for_overview_(false) {
   std::vector<WmWindow*> windows_in_root;
   for (auto* window : windows) {
     if (window->GetRootWindow() == root_window)
       windows_in_root.push_back(window);
   }
 
   for (auto* window : windows_in_root) {
-    window_observer_.Add(window);
+    window_observer_.Add(window->aura_window());
     window_state_observer_.Add(window->GetWindowState());
     window_list_.push_back(
         base::MakeUnique<WindowSelectorItem>(window, window_selector_));
   }
 }
 
 WindowGrid::~WindowGrid() {}
 
 void WindowGrid::Shutdown() {
   for (const auto& window : window_list_)
@@ skipping 257 matching lines @@
   WmWindow* selection_widget_window =
       WmLookup::Get()->GetWindowForWidget(selection_widget_.get());
   std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings_label =
       ScopedOverviewAnimationSettingsFactory::Get()
           ->CreateOverviewAnimationSettings(
               OverviewAnimationType::OVERVIEW_ANIMATION_CLOSING_SELECTOR_ITEM,
               selection_widget_window);
   selection_widget_->SetOpacity(0.f);
 }
 
-void WindowGrid::OnWindowDestroying(WmWindow* window) {
+void WindowGrid::OnWindowDestroying(aura::Window* window) {
   window_observer_.Remove(window);
-  window_state_observer_.Remove(window->GetWindowState());
+  window_state_observer_.Remove(wm::GetWindowState(window));
   auto iter = std::find_if(window_list_.begin(), window_list_.end(),
-                           WindowSelectorItemComparator(window));
+                           WindowSelectorItemComparator(WmWindow::Get(window)));
 
   DCHECK(iter != window_list_.end());
 
   size_t removed_index = iter - window_list_.begin();
   window_list_.erase(iter);
 
   if (empty()) {
     // If the grid is now empty, notify the window selector so that it erases us
     // from its grid list.
     window_selector_->OnGridEmpty(this);
     return;
   }
 
   // If selecting, update the selection index.
   if (selection_widget_) {
     bool send_focus_alert = selected_index_ == removed_index;
     if (selected_index_ >= removed_index && selected_index_ != 0)
       selected_index_--;
     SelectedWindow()->SetSelected(true);
     if (send_focus_alert)
       SelectedWindow()->SendAccessibleSelectionEvent();
   }
 
   PositionWindows(true);
 }
 
-void WindowGrid::OnWindowBoundsChanged(WmWindow* window,
+void WindowGrid::OnWindowBoundsChanged(aura::Window* window,
                                        const gfx::Rect& old_bounds,
                                        const gfx::Rect& new_bounds) {
   // During preparation, window bounds can change. Ignore bounds
   // change notifications in this case; we'll reposition soon.
   if (!prepared_for_overview_)
     return;
 
   auto iter = std::find_if(window_list_.begin(), window_list_.end(),
-                           WindowSelectorItemComparator(window));
+                           WindowSelectorItemComparator(WmWindow::Get(window)));
   DCHECK(iter != window_list_.end());
 
   // Immediately finish any active bounds animation.
-  window->StopAnimatingProperty(ui::LayerAnimationElement::BOUNDS);
+  window->layer()->GetAnimator()->StopAnimatingProperty(
+      ui::LayerAnimationElement::BOUNDS);
   PositionWindows(false);
 }
 
 void WindowGrid::OnPostWindowStateTypeChange(wm::WindowState* window_state,
                                              wm::WindowStateType old_type) {
   // During preparation, window state can change, e.g. updating shelf
   // visibility may show the temporarily hidden (minimized) panels.
   if (!prepared_for_overview_)
     return;
 
@@ skipping 212 matching lines @@
         *min_right = left;
       if (*max_right < left)
         *max_right = left;
     }
     *max_bottom = top + height;
   }
   return windows_fit;
 }
 
 }  // namespace ash