Shuffles around immersive related classes

ash/aura/wm_shell_aura.cc

 // 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.
 
 #include "ash/aura/wm_shell_aura.h"
 
 #include <utility>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_display_observer.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/metrics/task_switch_metrics_recorder.h"
+#include "ash/shared/immersive_fullscreen_controller.h"
 #include "ash/shell.h"
 #include "ash/touch/touch_uma.h"
 #include "ash/wm/drag_window_resizer.h"
-#include "ash/wm/immersive_fullscreen_controller.h"
 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "ash/wm/window_cycle_event_filter_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/wm/public/activation_client.h"
 
@@ skipping 162 matching lines @@
 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
 WmShellAura::CreateScopedDisableInternalMouseAndKeyboard() {
 #if defined(USE_X11)
   return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardX11);
 #elif defined(USE_OZONE)
   return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone);
 #endif
   return nullptr;
 }
 
-std::unique_ptr<WmImmersiveFullscreenController>
+std::unique_ptr<ImmersiveFullscreenController>
 WmShellAura::CreateImmersiveFullscreenController() {
   return base::MakeUnique<ImmersiveFullscreenController>();
 }
 
 void WmShellAura::OnOverviewModeStarting() {
   FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
                     OnOverviewModeStarting());
 }
 
 void WmShellAura::OnOverviewModeEnded() {
@@ skipping 73 matching lines @@
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanging());
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanged());
 }
 
 }  // namespace ash