Moves WindowSelectorController onto WmShell

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 78ee00d2744ef22abecc1d6e38367f00db1de364..41f73ba3e3dc684568a79ff724629df088f29d24 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -30,6 +30,7 @@ class SessionStateDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class WindowResizer;
+class WindowSelectorController;
 class WmActivationObserver;
 class WmDisplayObserver;
 class WmSystemTrayNotifier;
@@ -58,6 +59,10 @@ class ASH_EXPORT WmShell {
     return system_tray_delegate_.get();
   }
 
+  WindowSelectorController* window_selector_controller() {
+    return window_selector_controller_.get();
+  }
+
   virtual MruWindowTracker* GetMruWindowTracker() = 0;
 
   // Creates a new window used as a container of other windows. No painting is
@@ -131,11 +136,6 @@ class ASH_EXPORT WmShell {
   // Called after overview mode has ended.
   virtual void OnOverviewModeEnded() = 0;
 
-  // TODO(sky): if WindowSelectorController can't be moved over, move these
-  // onto their own local class.
-  virtual bool IsOverviewModeSelecting() = 0;
-  virtual bool IsOverviewModeRestoringMinimizedWindows() = 0;
-
   virtual AccessibilityDelegate* GetAccessibilityDelegate() = 0;
 
   virtual SessionStateDelegate* GetSessionStateDelegate() = 0;
@@ -165,6 +165,8 @@ class ASH_EXPORT WmShell {
   // is null, shuts down and destroys the delegate.
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
 
+  void DeleteWindowSelectorController();
+
  private:
   friend class Shell;
 
@@ -173,6 +175,7 @@ class ASH_EXPORT WmShell {
   std::unique_ptr<FocusCycler> focus_cycler_;
   std::unique_ptr<WmSystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
+  std::unique_ptr<WindowSelectorController> window_selector_controller_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 };