Moves WindowSelectorController onto 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>
@@ skipping 12 matching lines @@
 
 namespace ash {
 
 class AccessibilityDelegate;
 class FocusCycler;
 class MruWindowTracker;
 class SessionStateDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class WindowResizer;
+class WindowSelectorController;
 class WmActivationObserver;
 class WmDisplayObserver;
 class WmSystemTrayNotifier;
 class WmWindow;
 
 namespace wm {
 class WindowState;
 }
 
 // Similar to ash::Shell. Eventually the two will be merged.
 class ASH_EXPORT WmShell {
  public:
   // This is necessary for a handful of places that is difficult to plumb
   // through context.
   static void Set(WmShell* instance);
   static WmShell* Get();
   static bool HasInstance() { return instance_ != nullptr; }
 
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
   WmSystemTrayNotifier* system_tray_notifier() {
     return system_tray_notifier_.get();
   }
 
   SystemTrayDelegate* system_tray_delegate() {
     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
   // done to the created window.
   virtual WmWindow* NewContainerWindow() = 0;
 
   virtual WmWindow* GetFocusedWindow() = 0;
   virtual WmWindow* GetActiveWindow() = 0;
 
   virtual WmWindow* GetPrimaryRootWindow() = 0;
@@ skipping 53 matching lines @@
       std::unique_ptr<WindowResizer> next_window_resizer,
       wm::WindowState* window_state) = 0;
 
   // Called when the overview mode is about to be started (before the windows
   // get re-arranged).
   virtual void OnOverviewModeStarting() = 0;
 
   // 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;
 
   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 AddShellObserver(ShellObserver* observer) = 0;
   virtual void RemoveShellObserver(ShellObserver* observer) = 0;
 
   virtual void AddPointerWatcher(views::PointerWatcher* watcher) = 0;
   virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0;
 
 #if defined(OS_CHROMEOS)
   // TODO(jamescook): Remove this when VirtualKeyboardController has been moved.
   virtual void ToggleIgnoreExternalKeyboard() = 0;
 #endif
 
  protected:
   WmShell();
   virtual ~WmShell();
 
   // If |delegate| is not null, sets and initializes the delegate. If |delegate|
   // is null, shuts down and destroys the delegate.
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
 
+  void DeleteWindowSelectorController();
+
  private:
   friend class Shell;
 
   static WmShell* instance_;
 
   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;
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_