Move even more from WmShell to Shell

ash/shell.h

 // Copyright (c) 2012 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_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 89 matching lines @@
 class DisplayColorManager;
 class DisplayConfigurationController;
 class DisplayErrorObserver;
 class DragDropController;
 class EventClientImpl;
 class EventTransformationHandler;
 class FirstRunHelper;
 class FocusCycler;
 class GPUSupport;
 class HighContrastController;
+class ImmersiveContextAsh;
 class ImmersiveHandlerFactoryAsh;
 class KeyboardBrightnessControlDelegate;
 class KeyboardUI;
 class LaserPointerController;
 class LinkHandlerModelFactory;
 class LocaleNotificationController;
 class LockStateController;
 enum class LoginStatus;
 class LogoutConfirmationController;
 class MagnificationController;
+class MaximizeModeController;
+class MediaController;
 class MouseCursorEventFilter;
+class MruWindowTracker;
+class NewWindowController;
 class OverlayEventFilter;
 class PaletteDelegate;
 class PartialMagnificationController;
 class PowerButtonController;
 class PowerEventObserver;
 class ProjectingObserver;
 class ResizeShadowController;
 class ResolutionNotificationController;
 class RootWindowController;
 class ScopedOverviewAnimationSettingsFactoryAura;
@@ skipping 175 matching lines @@
   KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() {
     return keyboard_brightness_control_delegate_.get();
   }
   KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
   LocaleNotificationController* locale_notification_controller() {
     return locale_notification_controller_.get();
   }
   LogoutConfirmationController* logout_confirmation_controller() {
     return logout_confirmation_controller_.get();
   }
+  MaximizeModeController* maximize_mode_controller() {
+    return maximize_mode_controller_.get();
+  }
+  MediaController* media_controller() { return media_controller_.get(); }
+  MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
+  NewWindowController* new_window_controller() {
+    return new_window_controller_.get();
+  }
   SystemTrayController* system_tray_controller() {
     return system_tray_controller_.get();
   }
   SystemTrayDelegate* system_tray_delegate() {
     return system_tray_delegate_.get();
   }
   views::corewm::TooltipController* tooltip_controller() {
     return tooltip_controller_.get();
   }
   OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); }
@@ skipping 282 matching lines @@
   std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
   std::unique_ptr<WindowPositioner> window_positioner_;
 
   std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
   std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
   std::unique_ptr<CastConfigController> cast_config_;
   std::unique_ptr<DragDropController> drag_drop_controller_;
   std::unique_ptr<FocusCycler> focus_cycler_;
+  std::unique_ptr<ImmersiveContextAsh> immersive_context_;
   std::unique_ptr<KeyboardBrightnessControlDelegate>
       keyboard_brightness_control_delegate_;
   std::unique_ptr<KeyboardUI> keyboard_ui_;
   std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
+  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<PaletteDelegate> palette_delegate_;
   std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
   std::unique_ptr<ShellDelegate> shell_delegate_;
   std::unique_ptr<SystemTrayController> system_tray_controller_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<ToastManager> toast_manager_;
   std::unique_ptr<WallpaperController> wallpaper_controller_;
   std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
   std::unique_ptr<::wm::ShadowController> shadow_controller_;
   std::unique_ptr<::wm::VisibilityController> visibility_controller_;
@@ skipping 109 matching lines @@
   base::ObserverList<ShellObserver> shell_observers_;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_