Shuffles around immersive related classes

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 PointerWatcher;
 }
 
 namespace ash {
 
 class AcceleratorController;
 class AccessibilityDelegate;
 class BrightnessControlDelegate;
 class DisplayInfo;
 class FocusCycler;
+class ImmersiveContextAsh;
+class ImmersiveFullscreenController;
 class KeyboardBrightnessControlDelegate;
 class KeyboardUI;
 class MaximizeModeController;
 class MruWindowTracker;
 class NewWindowDelegate;
 class PaletteDelegate;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionStateDelegate;
 class ShelfDelegate;
 class ShelfModel;
 class ShelfWindowWatcher;
 class ShellDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class SystemTrayNotifier;
 class ToastManager;
 class WindowCycleController;
 class WindowCycleEventFilter;
 class WindowResizer;
 class WindowSelectorController;
 class WmActivationObserver;
 class WmDisplayObserver;
-class WmImmersiveFullscreenController;
 class WmWindow;
 
 enum class TaskSwitchSource;
 
 namespace wm {
 class MaximizeModeEventHandler;
 class WindowState;
 }
 
 #if defined(OS_CHROMEOS)
@@ skipping 188 matching lines @@
 
   virtual std::unique_ptr<WindowCycleEventFilter>
   CreateWindowCycleEventFilter() = 0;
 
   virtual std::unique_ptr<wm::MaximizeModeEventHandler>
   CreateMaximizeModeEventHandler() = 0;
 
   virtual std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
   CreateScopedDisableInternalMouseAndKeyboard() = 0;
 
-  virtual std::unique_ptr<WmImmersiveFullscreenController>
+  virtual std::unique_ptr<ImmersiveFullscreenController>
   CreateImmersiveFullscreenController() = 0;
 
   void CreateShelfDelegate();
 
   // Called after maximize mode has started, windows might still animate though.
   void OnMaximizeModeStarted();
 
   // Called after maximize mode has ended, windows might still be returning to
   // their original position.
   void OnMaximizeModeEnded();
@@ skipping 100 matching lines @@
 
   static WmShell* instance_;
 
   base::ObserverList<ShellObserver> shell_observers_;
   std::unique_ptr<ShellDelegate> delegate_;
 
   std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
   std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
   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<MaximizeModeController> maximize_mode_controller_;
   std::unique_ptr<MediaDelegate> media_delegate_;
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
   std::unique_ptr<NewWindowDelegate> new_window_delegate_;
   std::unique_ptr<PaletteDelegate> palette_delegate_;
   std::unique_ptr<ShelfDelegate> shelf_delegate_;
   std::unique_ptr<ShelfModel> shelf_model_;
@@ skipping 13 matching lines @@
   bool simulate_modal_window_open_for_testing_ = false;
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
 #endif
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_