Moves MruWindowTracker to WmShell

ash/aura/wm_shell_aura.cc

 // Copyright 2016 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/aura/wm_shell_aura.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #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"
 #include "ash/wm/drag_window_resizer.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
-WmShellAura::WmShellAura() {
+WmShellAura::WmShellAura(WmShellCommon* wm_shell_common)
+    : wm_shell_common_(wm_shell_common) {
   WmShell::Set(this);
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 WmShellAura::~WmShellAura() {
   WmShell::Set(nullptr);
 
   if (added_activation_observer_)
     Shell::GetInstance()->activation_client()->RemoveObserver(this);
 
   if (added_display_observer_)
     Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
 
   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);
   return WmWindowAura::Get(aura_window);
 }
 
 WmWindow* WmShellAura::GetFocusedWindow() {
   return WmWindowAura::Get(
       aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
           ->GetFocusedWindow());
@@ skipping 10 matching lines @@
 WmWindow* WmShellAura::GetRootWindowForDisplayId(int64_t display_id) {
   return WmWindowAura::Get(Shell::GetInstance()
                                ->window_tree_host_manager()
                                ->GetRootWindowForDisplayId(display_id));
 }
 
 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();
 }
 
 bool WmShellAura::CanShowWindowForUser(WmWindow* window) {
   return Shell::GetInstance()->delegate()->CanShowWindowForUser(
       WmWindowAura::GetAuraWindow(window));
 }
 
@@ skipping 100 matching lines @@
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanged());
 }
 
 void WmShellAura::OnOverviewModeEnded() {
   FOR_EACH_OBSERVER(WmOverviewModeObserver, overview_mode_observers_,
                     OnOverviewModeEnded());
 }
 
 }  // namespace ash