Moves MruWindowTracker to WmShell

ash/common/wm_shell.h

 // 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.
 
 #ifndef ASH_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace ash {
 
+class Shell;
+class MruWindowTracker;
 class SessionStateDelegate;
 class WindowResizer;
 class WmActivationObserver;
 class WmDisplayObserver;
 class WmOverviewModeObserver;
 class WmWindow;
 
 namespace wm {
 
 class WindowState;
 
 enum class WmUserMetricsAction;
 }
 
 // Similar to ash::Shell. Eventually the two will be merged.
 class ASH_EXPORT WmShell {
  public:
-  virtual ~WmShell() {}
-
   // This is necessary for a handful of places that is difficult to plumb
   // through context.
   static void Set(WmShell* instance);
   static WmShell* Get();
 
+  MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
+
   // Creates a new window used as a container of other windows. No painting is
   // done to the created window.
   virtual WmWindow* NewContainerWindow() = 0;
 
   virtual WmWindow* GetFocusedWindow() = 0;
   virtual WmWindow* GetActiveWindow() = 0;
 
   virtual WmWindow* GetPrimaryRootWindow() = 0;
 
   // Returns the root window for the specified display.
   virtual WmWindow* GetRootWindowForDisplayId(int64_t display_id) = 0;
 
   // Returns the root window that newly created windows should be added to.
   // NOTE: this returns the root, newly created window should be added to the
   // appropriate container in the returned window.
   virtual WmWindow* GetRootWindowForNewWindows() = 0;
 
-  // Returns the list of most recently used windows.
-  virtual std::vector<WmWindow*> GetMruWindowList() = 0;
-
-  // Returns the list of most recently used windows excluding modals.
-  virtual std::vector<WmWindow*> GetMruWindowListIgnoreModals() = 0;
-
   // Returns true if the first window shown on first run should be
   // unconditionally maximized, overriding the heuristic that normally chooses
   // the window size.
   virtual bool IsForceMaximizeOnFirstRun() = 0;
 
   // Returns true if |window| can be shown for the current user. This is
   // intended to check if the current user matches the user associated with
   // |window|.
   virtual bool CanShowWindowForUser(WmWindow* window) = 0;
 
@@ skipping 21 matching lines @@
 
   virtual void AddActivationObserver(WmActivationObserver* observer) = 0;
   virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0;
 
   virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0;
   virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0;
 
   virtual void AddOverviewModeObserver(WmOverviewModeObserver* observer) = 0;
   virtual void RemoveOverviewModeObserver(WmOverviewModeObserver* observer) = 0;
 
+ protected:
+  WmShell();
+  virtual ~WmShell();
+
+  void CreateMruWindowTracker();
+  void DeleteMruWindowTracker();
+
  private:
+  friend class Shell;
+
   static WmShell* instance_;
+
+  std::unique_ptr<MruWindowTracker> mru_window_tracker_;
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_