Converts WmActivationObserver to aura::client::ActivationChangeObserver

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 "ash/shell.h"
 #include "base/bind.h"
 #include "ui/aura/window.h"
+#include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 namespace {
 
 using CanActivateWindowPredicate = base::Callback<bool(WmWindow*)>;
 
 bool CallCanActivate(WmWindow* window) {
   return window->CanActivate();
 }
@@ skipping 65 matching lines @@
 
   return windows;
 }
 
 }  // namespace
 
 //////////////////////////////////////////////////////////////////////////////
 // MruWindowTracker, public:
 
 MruWindowTracker::MruWindowTracker() : ignore_window_activations_(false) {
-  WmShell::Get()->AddActivationObserver(this);
+  Shell::GetInstance()->activation_client()->AddObserver(this);
 }
 
 MruWindowTracker::~MruWindowTracker() {
-  WmShell::Get()->RemoveActivationObserver(this);
+  Shell::GetInstance()->activation_client()->RemoveObserver(this);
   for (WmWindow* window : mru_windows_)
     window->aura_window()->RemoveObserver(this);
 }
 
 MruWindowTracker::WindowList MruWindowTracker::BuildMruWindowList() const {
   return BuildWindowListInternal(&mru_windows_, base::Bind(&CallCanActivate));
 }
 
 MruWindowTracker::WindowList MruWindowTracker::BuildWindowListIgnoreModal()
     const {
@@ skipping 20 matching lines @@
   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->aura_window()->AddObserver(this);
   else
     mru_windows_.erase(iter);
   mru_windows_.push_front(active_window);
 }
 
-void MruWindowTracker::OnWindowActivated(WmWindow* gained_active,
-                                         WmWindow* lost_active) {
+void MruWindowTracker::OnWindowActivated(ActivationReason reason,
+                                         aura::Window* gained_active,
+                                         aura::Window* lost_active) {
   if (!ignore_window_activations_)
-    SetActiveWindow(gained_active);
+    SetActiveWindow(WmWindow::Get(gained_active));
 }
 
 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(WmWindow::Get(window));
   window->RemoveObserver(this);
 }
 
 }  // namespace ash