Moves MruWindowTracker to WmShell

ash/aura/wm_shell_aura.cc

Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index 7b6e2e16c515db54371d5058c1b336f624a2fc82..f86b2b17f1ee33b3f5d99dfdca800b4ea456d1df 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -10,6 +10,7 @@
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_display_observer.h"
 #include "ash/common/wm_overview_mode_observer.h"
+#include "ash/common/wm_shell_common.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ -22,7 +23,8 @@
 
 namespace ash {
 
-WmShellAura::WmShellAura() {
+WmShellAura::WmShellAura(WmShellCommon* wm_shell_common)
+    : wm_shell_common_(wm_shell_common) {
   WmShell::Set(this);
   Shell::GetInstance()->AddShellObserver(this);
 }
@@ -39,6 +41,10 @@ WmShellAura::~WmShellAura() {
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
+MruWindowTracker* WmShellAura::GetMruWindowTracker() {
+  return wm_shell_common_->mru_window_tracker();
+}
+
 WmWindow* WmShellAura::NewContainerWindow() {
   aura::Window* aura_window = new aura::Window(nullptr);
   aura_window->Init(ui::LAYER_NOT_DRAWN);
@@ -69,19 +75,6 @@ WmWindow* WmShellAura::GetRootWindowForNewWindows() {
   return WmWindowAura::Get(Shell::GetTargetRootWindow());
 }
 
-std::vector<WmWindow*> WmShellAura::GetMruWindowList() {
-  // TODO(sky): remove this and provide accessor for MruWindowTracker.
-  // http://crbug.com/617789.
-  return Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList();
-}
-
-std::vector<WmWindow*> WmShellAura::GetMruWindowListIgnoreModals() {
-  // TODO(sky): remove this and provide accessor for MruWindowTracker.
-  // http://crbug.com/617789.
-  return Shell::GetInstance()
-      ->mru_window_tracker()
-      ->BuildWindowListIgnoreModal();
-}
 
 bool WmShellAura::IsForceMaximizeOnFirstRun() {
   return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun();