Replace WmWindowObserver with aura::WindowObserver.

ash/common/wm/mru_window_tracker.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/wm/mru_window_tracker.h"
 
 #include <algorithm>
 
 #include "ash/common/wm/focus_rules.h"
 #include "ash/common/wm/switchable_windows.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/bind.h"
+#include "ui/aura/window.h"
 
 namespace ash {
 
 namespace {
 
 using CanActivateWindowPredicate = base::Callback<bool(WmWindow*)>;
 
 bool CallCanActivate(WmWindow* window) {
   return window->CanActivate();
 }
@@ skipping 71 matching lines @@
 //////////////////////////////////////////////////////////////////////////////
 // MruWindowTracker, public:
 
 MruWindowTracker::MruWindowTracker() : ignore_window_activations_(false) {
   WmShell::Get()->AddActivationObserver(this);
 }
 
 MruWindowTracker::~MruWindowTracker() {
   WmShell::Get()->RemoveActivationObserver(this);
   for (WmWindow* window : mru_windows_)
-    window->RemoveObserver(this);
+    window->aura_window()->RemoveObserver(this);
 }
 
 MruWindowTracker::WindowList MruWindowTracker::BuildMruWindowList() const {
   return BuildWindowListInternal(&mru_windows_, base::Bind(&CallCanActivate));
 }
 
 MruWindowTracker::WindowList MruWindowTracker::BuildWindowListIgnoreModal()
     const {
   return BuildWindowListInternal(nullptr,
                                  base::Bind(&IsWindowConsideredActivatable));
@@ skipping 12 matching lines @@
 // MruWindowTracker, private:
 
 void MruWindowTracker::SetActiveWindow(WmWindow* active_window) {
   if (!active_window)
     return;
 
   std::list<WmWindow*>::iterator iter =
       std::find(mru_windows_.begin(), mru_windows_.end(), active_window);
   // Observe all newly tracked windows.
   if (iter == mru_windows_.end())
-    active_window->AddObserver(this);
+    active_window->aura_window()->AddObserver(this);
   else
     mru_windows_.erase(iter);
   mru_windows_.push_front(active_window);
 }
 
 void MruWindowTracker::OnWindowActivated(WmWindow* gained_active,
                                          WmWindow* lost_active) {
   if (!ignore_window_activations_)
     SetActiveWindow(gained_active);
 }
 
-void MruWindowTracker::OnWindowDestroyed(WmWindow* window) {
+void MruWindowTracker::OnWindowDestroyed(aura::Window* window) {
   // It's possible for OnWindowActivated() to be called after
   // OnWindowDestroying(). This means we need to override OnWindowDestroyed()
   // else we may end up with a deleted window in |mru_windows_|.
-  mru_windows_.remove(window);
+  mru_windows_.remove(WmWindow::Get(window));
   window->RemoveObserver(this);
 }
 
 }  // namespace ash