Moves MruWindowTracker to WmShell

ash/mus/bridge/wm_shell_mus.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/mus/bridge/wm_shell_mus.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm_activation_observer.h"
+#include "ash/common/wm_shell_common.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/container_ids.h"
 #include "ash/mus/drag_window_resizer.h"
 #include "ash/mus/root_window_controller.h"
 #include "base/memory/ptr_util.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_client.h"
 #include "components/user_manager/user_info_impl.h"
@@ skipping 61 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
 }  // namespace
 
 WmShellMus::WmShellMus(::mus::WindowTreeClient* client)
     : client_(client), session_state_delegate_(new SessionStateDelegateStub) {
   client_->AddObserver(this);
   WmShell::Set(this);
+
+  wm_shell_common_.reset(new WmShellCommon);
+  wm_shell_common_->CreateMruWindowTracker();
 }
 
 WmShellMus::~WmShellMus() {
+  wm_shell_common_->DeleteMruWindowTracker();
   RemoveClientObserver();
   WmShell::Set(nullptr);
 }
 
 // static
 WmShellMus* WmShellMus::Get() {
   return static_cast<WmShellMus*>(WmShell::Get());
 }
 
 void WmShellMus::AddRootWindowController(
@@ skipping 23 matching lines @@
     int64_t id) {
   for (WmRootWindowControllerMus* root_window_controller :
        root_window_controllers_) {
     if (root_window_controller->GetDisplay().id() == id)
       return root_window_controller;
   }
   NOTREACHED();
   return nullptr;
 }
 
+MruWindowTracker* WmShellMus::GetMruWindowTracker() {
+  return wm_shell_common_->mru_window_tracker();
+}
+
 WmWindow* WmShellMus::NewContainerWindow() {
   return WmWindowMus::Get(client_->NewWindow());
 }
 
 WmWindow* WmShellMus::GetFocusedWindow() {
   return WmWindowMus::Get(client_->GetFocusedWindow());
 }
 
 WmWindow* WmShellMus::GetActiveWindow() {
   return GetToplevelAncestor(client_->GetFocusedWindow());
 }
 
 WmWindow* WmShellMus::GetPrimaryRootWindow() {
   return root_window_controllers_[0]->GetWindow();
 }
 
 WmWindow* WmShellMus::GetRootWindowForDisplayId(int64_t display_id) {
   return GetRootWindowControllerWithDisplayId(display_id)->GetWindow();
 }
 
 WmWindow* WmShellMus::GetRootWindowForNewWindows() {
   NOTIMPLEMENTED();
   return root_window_controllers_[0]->GetWindow();
 }
 
-std::vector<WmWindow*> WmShellMus::GetMruWindowList() {
-  NOTIMPLEMENTED();
-  return std::vector<WmWindow*>();
-}
-
-std::vector<WmWindow*> WmShellMus::GetMruWindowListIgnoreModals() {
-  NOTIMPLEMENTED();
-  return std::vector<WmWindow*>();
-}
-
 bool WmShellMus::IsForceMaximizeOnFirstRun() {
   NOTIMPLEMENTED();
   return false;
 }
 
 bool WmShellMus::CanShowWindowForUser(WmWindow* window) {
   NOTIMPLEMENTED();
   return true;
 }
 
@@ skipping 87 matching lines @@
                     OnWindowActivated(gained_active, lost_active));
 }
 
 void WmShellMus::OnWillDestroyClient(::mus::WindowTreeClient* client) {
   DCHECK_EQ(client, client_);
   RemoveClientObserver();
 }
 
 }  // namespace mus
 }  // namespace ash