Shuffles and renames ash/common/wm 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.cc',
@@ skipping 25 matching lines @@
       'ash_constants.h',
       'ash_export.h',
       'ash_layout_constants.cc',
       'ash_layout_constants.h',
       'ash_switches.cc',
       'ash_switches.h',
       'ash_touch_exploration_manager_chromeos.cc',
       'ash_touch_exploration_manager_chromeos.h',
       'audio/sounds.cc',
       'audio/sounds.h',
+      'aura/aura_layout_manager_adapter.cc',
+      'aura/aura_layout_manager_adapter.h',
+      'aura/wm_lookup_aura.cc',
+      'aura/wm_lookup_aura.h',
+      'aura/wm_root_window_controller_aura.cc',
+      'aura/wm_root_window_controller_aura.h',
+      'aura/wm_shelf_aura.cc',
+      'aura/wm_shelf_aura.h',
+      'aura/wm_shell_aura.cc',
+      'aura/wm_shell_aura.h',
+      'aura/wm_window_aura.cc',
+      'aura/wm_window_aura.h',
       'autoclick/autoclick_controller.cc',
       'autoclick/autoclick_controller.h',
       'cancel_mode.cc',
       'cancel_mode.h',
       'cast_config_delegate.cc',
       'cast_config_delegate.h',
       'common/root_window_controller_common.cc',
       'common/root_window_controller_common.h',
       'common/shell_window_ids.h',
       'common/wm/always_on_top_controller.cc',
@@ skipping 41 matching lines @@
       'common/wm/window_positioning_utils.h',
       'common/wm/window_resizer.cc',
       'common/wm/window_resizer.h',
       'common/wm/window_state.cc',
       'common/wm/window_state.h',
       'common/wm/window_state_delegate.cc',
       'common/wm/window_state_delegate.h',
       'common/wm/window_state_observer.h',
       'common/wm/window_state_util.cc',
       'common/wm/window_state_util.h',
-      'common/wm/wm_activation_observer.h',
-      'common/wm/wm_display_observer.h',
       'common/wm/wm_event.cc',
       'common/wm/wm_event.h',
-      'common/wm/wm_globals.cc',
-      'common/wm/wm_globals.h',
-      'common/wm/wm_layout_manager.h',
-      'common/wm/wm_lookup.cc',
-      'common/wm/wm_lookup.h',
-      'common/wm/wm_overview_mode_observer.h',
-      'common/wm/wm_root_window_controller.h',
-      'common/wm/wm_root_window_controller_observer.h',
       'common/wm/wm_screen_util.cc',
       'common/wm/wm_screen_util.h',
       'common/wm/wm_snap_to_pixel_layout_manager.cc',
       'common/wm/wm_snap_to_pixel_layout_manager.h',
       'common/wm/wm_toplevel_window_event_handler.cc',
       'common/wm/wm_toplevel_window_event_handler.h',
       'common/wm/wm_types.cc',
       'common/wm/wm_types.h',
       'common/wm/wm_user_metrics_action.h',
-      'common/wm/wm_window.h',
-      'common/wm/wm_window_observer.h',
-      'common/wm/wm_window_property.h',
-      'common/wm/wm_window_tracker.h',
       'common/wm/workspace/magnetism_matcher.cc',
       'common/wm/workspace/magnetism_matcher.h',
       'common/wm/workspace/multi_window_resize_controller.cc',
       'common/wm/workspace/multi_window_resize_controller.h',
       'common/wm/workspace/phantom_window_controller.cc',
       'common/wm/workspace/phantom_window_controller.h',
       'common/wm/workspace/two_step_edge_cycler.cc',
       'common/wm/workspace/two_step_edge_cycler.h',
       'common/wm/workspace/workspace_layout_manager.cc',
       'common/wm/workspace/workspace_layout_manager.h',
       'common/wm/workspace/workspace_layout_manager_backdrop_delegate.h',
       'common/wm/workspace/workspace_layout_manager_delegate.h',
       'common/wm/workspace/workspace_types.h',
       'common/wm/workspace/workspace_window_resizer.cc',
       'common/wm/workspace/workspace_window_resizer.h',
+      'common/wm_activation_observer.h',
+      'common/wm_display_observer.h',
+      'common/wm_layout_manager.h',
+      'common/wm_lookup.cc',
+      'common/wm_lookup.h',
+      'common/wm_overview_mode_observer.h',
+      'common/wm_root_window_controller.h',
+      'common/wm_root_window_controller_observer.h',
+      'common/wm_shell.cc',
+      'common/wm_shell.h',
+      'common/wm_window.h',
+      'common/wm_window_observer.h',
+      'common/wm_window_property.h',
+      'common/wm_window_tracker.h',
       'container_delegate.h',
       'container_delegate_aura.cc',
       'container_delegate_aura.h',
       'debug.cc',
       'debug.h',
       'default_accessibility_delegate.cc',
       'default_accessibility_delegate.h',
       'default_user_wallpaper_delegate.cc',
       'default_user_wallpaper_delegate.h',
       'desktop_background/desktop_background_controller.cc',
@@ skipping 460 matching lines @@
       'touch/touchscreen_util.h',
       'utility/screenshot_controller.cc',
       'utility/screenshot_controller.h',
       'virtual_keyboard_controller.cc',
       'virtual_keyboard_controller.h',
       'volume_control_delegate.h',
       'wm/ash_focus_rules.cc',
       'wm/ash_focus_rules.h',
       'wm/ash_native_cursor_manager.cc',
       'wm/ash_native_cursor_manager.h',
-      'wm/aura/aura_layout_manager_adapter.cc',
-      'wm/aura/aura_layout_manager_adapter.h',
-      'wm/aura/wm_globals_aura.cc',
-      'wm/aura/wm_globals_aura.h',
-      'wm/aura/wm_lookup_aura.cc',
-      'wm/aura/wm_lookup_aura.h',
-      'wm/aura/wm_root_window_controller_aura.cc',
-      'wm/aura/wm_root_window_controller_aura.h',
-      'wm/aura/wm_shelf_aura.cc',
-      'wm/aura/wm_shelf_aura.h',
-      'wm/aura/wm_window_aura.cc',
-      'wm/aura/wm_window_aura.h',
       'wm/boot_splash_screen_chromeos.cc',
       'wm/boot_splash_screen_chromeos.h',
       'wm/cursor_manager_chromeos.cc',
       'wm/cursor_manager_chromeos.h',
       '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',
@@ skipping 794 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }