Move even more from WmShell to Shell

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 20 matching lines @@
 class Point;
 }
 
 namespace views {
 class PointerWatcher;
 enum class PointerWatcherEventTypes;
 }
 
 namespace ash {
 class AcceleratorController;
-class ImmersiveContextAsh;
 class ImmersiveFullscreenController;
 class KeyEventWatcher;
 class KeyboardUI;
-class MaximizeModeController;
-class MediaController;
-class MruWindowTracker;
-class NewWindowController;
 class RootWindowController;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionController;
 class SessionStateDelegate;
 class ShelfController;
 class ShelfDelegate;
 class ShelfModel;
 class ShelfWindowWatcher;
 struct ShellInitParams;
 class ShutdownController;
@@ skipping 18 matching lines @@
 // Similar to ash::Shell. Eventually the two will be merged.
 class ASH_EXPORT WmShell : public SessionStateObserver {
  public:
   ~WmShell() override;
 
   static WmShell* Get();
   static bool HasInstance() { return instance_ != nullptr; }
 
   virtual void Shutdown();
 
-  MaximizeModeController* maximize_mode_controller() {
-    return maximize_mode_controller_.get();
-  }
-
-  MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
-
-  MediaController* media_controller() { return media_controller_.get(); }
-
-  NewWindowController* new_window_controller() {
-    return new_window_controller_.get();
-  }
-
   SessionController* session_controller() { return session_controller_.get(); }
 
   ShelfController* shelf_controller() { return shelf_controller_.get(); }
 
   ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
 
   ShelfModel* shelf_model();
 
   ShutdownController* shutdown_controller() {
     return shutdown_controller_.get();
@@ skipping 186 matching lines @@
   virtual void InitHosts(const ShellInitParams& init_params) = 0;
 
   // Called during startup to create the AcceleratorController.
   virtual std::unique_ptr<AcceleratorController>
   CreateAcceleratorController() = 0;
 
   void DeleteWindowCycleController();
 
   void DeleteWindowSelectorController();
 
-  void CreateMaximizeModeController();
-  void DeleteMaximizeModeController();
-
-  void CreateMruWindowTracker();
-  void DeleteMruWindowTracker();
-
   // SessionStateObserver:
   void SessionStateChanged(session_manager::SessionState state) override;
 
  private:
   friend class AcceleratorControllerTest;
   friend class Shell;
 
   static WmShell* instance_;
 
-  std::unique_ptr<ImmersiveContextAsh> immersive_context_;
-  std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
-  std::unique_ptr<MediaController> media_controller_;
-  std::unique_ptr<MruWindowTracker> mru_window_tracker_;
-  std::unique_ptr<NewWindowController> new_window_controller_;
   std::unique_ptr<SessionController> session_controller_;
   std::unique_ptr<ShelfController> shelf_controller_;
   std::unique_ptr<ShelfDelegate> shelf_delegate_;
   std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
   std::unique_ptr<ShutdownController> shutdown_controller_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<VpnList> vpn_list_;
   std::unique_ptr<WindowCycleController> window_cycle_controller_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;
 
   base::ObserverList<LockStateObserver> lock_state_observers_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_