Shuffles around immersive related classes

ash/ash.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # These files lists are shared with the GN build.
     'ash_sources': [
       'accelerators/accelerator_commands_aura.cc',
@@ skipping 400 matching lines @@
       'common/wm/dock/docked_window_resizer.cc',
       'common/wm/dock/docked_window_resizer.h',
       'common/wm/drag_details.cc',
       'common/wm/drag_details.h',
       'common/wm/focus_rules.cc',
       'common/wm/focus_rules.h',
       'common/wm/forwarding_layer_delegate.cc',
       'common/wm/forwarding_layer_delegate.h',
       'common/wm/fullscreen_window_finder.cc',
       'common/wm/fullscreen_window_finder.h',
-      'common/wm/immersive/wm_immersive_fullscreen_controller.h',
-      'common/wm/immersive/wm_immersive_fullscreen_controller_delegate.h',
-      'common/wm/immersive_revealed_lock.cc',
-      'common/wm/immersive_revealed_lock.h',
+      'common/wm/immersive_context_ash.cc',
+      'common/wm/immersive_context_ash.h',
       'common/wm/lock_state_observer.h',
       'common/wm/maximize_mode/maximize_mode_controller.cc',
       'common/wm/maximize_mode/maximize_mode_controller.h',
       'common/wm/maximize_mode/maximize_mode_event_handler.cc',
       'common/wm/maximize_mode/maximize_mode_event_handler.h',
       'common/wm/maximize_mode/maximize_mode_window_manager.cc',
       'common/wm/maximize_mode/maximize_mode_window_manager.h',
       'common/wm/maximize_mode/maximize_mode_window_state.cc',
       'common/wm/maximize_mode/maximize_mode_window_state.h',
       'common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h',
@@ skipping 205 matching lines @@
       'rotator/screen_rotation_animator.cc',
       'rotator/screen_rotation_animator.h',
       'rotator/window_rotation.cc',
       'rotator/window_rotation.h',
       'screen_util.cc',
       'screen_util.h',
       'screenshot_delegate.h',
       'shared/immersive_context.cc',
       'shared/immersive_context.h',
       'shared/immersive_focus_watcher.h',
+      'shared/immersive_fullscreen_controller.cc',
+      'shared/immersive_fullscreen_controller.h',
+      'shared/immersive_fullscreen_controller_delegate.h',
       'shared/immersive_gesture_handler.h',
+      'shared/immersive_handler_factory.cc',
+      'shared/immersive_handler_factory.h',
+      'shared/immersive_revealed_lock.cc',
+      'shared/immersive_revealed_lock.h',
       'shelf/dimmer_view.cc',
       'shelf/dimmer_view.h',
       'shelf/shelf.cc',
       'shelf/shelf.h',
       'shelf/shelf_bezel_event_handler.cc',
       'shelf/shelf_bezel_event_handler.h',
       'shelf/shelf_layout_manager.cc',
       'shelf/shelf_layout_manager.h',
       'shelf/shelf_layout_manager_observer.h',
       'shelf/shelf_util.cc',
@@ skipping 48 matching lines @@
       'wm/dim_window.cc',
       'wm/dim_window.h',
       'wm/drag_window_controller.cc',
       'wm/drag_window_controller.h',
       'wm/drag_window_resizer.cc',
       'wm/drag_window_resizer.h',
       'wm/event_client_impl.cc',
       'wm/event_client_impl.h',
       'wm/gestures/overview_gesture_handler.cc',
       'wm/gestures/overview_gesture_handler.h',
-      'wm/immersive_context_ash.cc',
-      'wm/immersive_context_ash.h',
       'wm/immersive_focus_watcher_aura.cc',
       'wm/immersive_focus_watcher_aura.h',
-      'wm/immersive_fullscreen_controller.cc',
-      'wm/immersive_fullscreen_controller.h',
       'wm/immersive_gesture_handler_aura.cc',
       'wm/immersive_gesture_handler_aura.h',
-      'wm/immersive_handler_factory.cc',
-      'wm/immersive_handler_factory.h',
       'wm/immersive_handler_factory_ash.cc',
       'wm/immersive_handler_factory_ash.h',
       'wm/lock_layout_manager.cc',
       'wm/lock_layout_manager.h',
       'wm/lock_state_controller.cc',
       'wm/lock_state_controller.h',
       'wm/lock_window_state.cc',
       'wm/lock_window_state.h',
       'wm/maximize_mode/maximize_mode_event_handler_aura.cc',
       'wm/maximize_mode/maximize_mode_event_handler_aura.h',
@@ skipping 762 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }