Shuffles around immersive related classes

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 0ff69ef77be773f17ef8d6dec55c87947651edcd..c2a0f934eb56e3657969f62a5364b4baf5b85daa 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -38,6 +38,8 @@ class AccessibilityDelegate;
 class BrightnessControlDelegate;
 class DisplayInfo;
 class FocusCycler;
+class ImmersiveContextAsh;
+class ImmersiveFullscreenController;
 class KeyboardBrightnessControlDelegate;
 class KeyboardUI;
 class MaximizeModeController;
@@ -60,7 +62,6 @@ class WindowResizer;
 class WindowSelectorController;
 class WmActivationObserver;
 class WmDisplayObserver;
-class WmImmersiveFullscreenController;
 class WmWindow;
 
 enum class TaskSwitchSource;
@@ -269,7 +270,7 @@ class ASH_EXPORT WmShell {
   virtual std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
   CreateScopedDisableInternalMouseAndKeyboard() = 0;
 
-  virtual std::unique_ptr<WmImmersiveFullscreenController>
+  virtual std::unique_ptr<ImmersiveFullscreenController>
   CreateImmersiveFullscreenController() = 0;
 
   void CreateShelfDelegate();
@@ -390,6 +391,7 @@ class ASH_EXPORT WmShell {
   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_;