Promotes more accessors 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 26 matching lines @@
 
 namespace ash {
 class AcceleratorController;
 class ImmersiveFullscreenController;
 class KeyEventWatcher;
 class KeyboardUI;
 class RootWindowController;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionStateDelegate;
 struct ShellInitParams;
-class ShutdownController;
-class SystemTrayNotifier;
-class VpnList;
-class WindowCycleController;
 class WindowCycleEventFilter;
 class WindowResizer;
-class WindowSelectorController;
 class WmDisplayObserver;
 class WmWindow;
 class WorkspaceEventHandler;
 
 enum class LoginStatus;
 enum class TaskSwitchSource;
 
 namespace wm {
 class MaximizeModeEventHandler;
 class WindowState;
 }
 
 // Similar to ash::Shell. Eventually the two will be merged.
 class ASH_EXPORT WmShell {
  public:
   virtual ~WmShell();
 
   static WmShell* Get();
   static bool HasInstance() { return instance_ != nullptr; }
 
   virtual void Shutdown();
 
-  ShutdownController* shutdown_controller() {
-    return shutdown_controller_.get();
-  }
-
-  SystemTrayNotifier* system_tray_notifier() {
-    return system_tray_notifier_.get();
-  }
-
-  VpnList* vpn_list() { return vpn_list_.get(); }
-
-  WindowCycleController* window_cycle_controller() {
-    return window_cycle_controller_.get();
-  }
-
-  WindowSelectorController* window_selector_controller() {
-    return window_selector_controller_.get();
-  }
-
   // Returns true when ash is running as a service_manager::Service.
   virtual bool IsRunningInMash() const = 0;
 
   virtual WmWindow* GetFocusedWindow() = 0;
   virtual WmWindow* GetActiveWindow() = 0;
 
   virtual WmWindow* GetCaptureWindow() = 0;
 
   // Convenience for GetPrimaryRootWindow()->GetRootWindowController().
   RootWindowController* GetPrimaryRootWindowController();
@@ skipping 144 matching lines @@
 
   // Called during startup to create the primary WindowTreeHost and
   // the corresponding RootWindowController.
   virtual void CreatePrimaryHost() = 0;
   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();
-
  private:
   friend class AcceleratorControllerTest;
   friend class Shell;
 
   static WmShell* instance_;
 
-  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_