Moves ash/wm/common back into ash

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index cb7cd4a6213c2e339142463a106806adf4d9f6c9..18992b19d4dde8bdde318362ee641c5f941a443a 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -544,6 +544,96 @@
       'wm/aura/wm_window_aura.h',
       'wm/boot_splash_screen_chromeos.cc',
       'wm/boot_splash_screen_chromeos.h',
+      'wm/common/always_on_top_controller.cc',
+      'wm/common/always_on_top_controller.h',
+      'wm/common/background_animator.cc',
+      'wm/common/background_animator.h',
+      'wm/common/container_finder.cc',
+      'wm/common/container_finder.h',
+      'wm/common/default_state.cc',
+      'wm/common/default_state.h',
+      'wm/common/default_window_resizer.cc',
+      'wm/common/default_window_resizer.h',
+      'wm/common/dock/docked_window_layout_manager.cc',
+      'wm/common/dock/docked_window_layout_manager.h',
+      'wm/common/dock/docked_window_layout_manager_observer.h',
+      'wm/common/dock/docked_window_resizer.cc',
+      'wm/common/dock/docked_window_resizer.h',
+      'wm/common/drag_details.cc',
+      'wm/common/drag_details.h',
+      'wm/common/fullscreen_window_finder.cc',
+      'wm/common/fullscreen_window_finder.h',
+      'wm/common/panels/panel_layout_manager.cc',
+      'wm/common/panels/panel_layout_manager.h',
+      'wm/common/panels/panel_window_resizer.cc',
+      'wm/common/panels/panel_window_resizer.h',
+      'wm/common/root_window_finder.cc',
+      'wm/common/root_window_finder.h',
+      'wm/common/shelf/wm_shelf.h',
+      'wm/common/shelf/wm_shelf_constants.cc',
+      'wm/common/shelf/wm_shelf_constants.h',
+      'wm/common/shelf/wm_shelf_observer.h',
+      'wm/common/shelf/wm_shelf_types.h',
+      'wm/common/shelf/wm_shelf_util.cc',
+      'wm/common/shelf/wm_shelf_util.h',
+      'wm/common/switchable_windows.cc',
+      'wm/common/switchable_windows.h',
+      'wm/common/window_animation_types.h',
+      'wm/common/window_parenting_utils.cc',
+      'wm/common/window_parenting_utils.h',
+      'wm/common/window_positioner.cc',
+      'wm/common/window_positioner.h',
+      'wm/common/window_positioning_utils.cc',
+      'wm/common/window_positioning_utils.h',
+      'wm/common/window_resizer.cc',
+      'wm/common/window_resizer.h',
+      'wm/common/window_state.cc',
+      'wm/common/window_state.h',
+      'wm/common/window_state_delegate.cc',
+      'wm/common/window_state_delegate.h',
+      'wm/common/window_state_observer.h',
+      'wm/common/window_state_util.cc',
+      'wm/common/window_state_util.h',
+      'wm/common/wm_activation_observer.h',
+      'wm/common/wm_display_observer.h',
+      'wm/common/wm_event.cc',
+      'wm/common/wm_event.h',
+      'wm/common/wm_globals.cc',
+      'wm/common/wm_globals.h',
+      'wm/common/wm_layout_manager.h',
+      'wm/common/wm_lookup.cc',
+      'wm/common/wm_lookup.h',
+      'wm/common/wm_overview_mode_observer.h',
+      'wm/common/wm_root_window_controller.h',
+      'wm/common/wm_root_window_controller_observer.h',
+      'wm/common/wm_screen_util.cc',
+      'wm/common/wm_screen_util.h',
+      'wm/common/wm_snap_to_pixel_layout_manager.cc',
+      'wm/common/wm_snap_to_pixel_layout_manager.h',
+      'wm/common/wm_toplevel_window_event_handler.cc',
+      'wm/common/wm_toplevel_window_event_handler.h',
+      'wm/common/wm_types.cc',
+      'wm/common/wm_types.h',
+      'wm/common/wm_user_metrics_action.h',
+      'wm/common/wm_window.h',
+      'wm/common/wm_window_observer.h',
+      'wm/common/wm_window_property.h',
+      'wm/common/wm_window_tracker.h',
+      'wm/common/workspace/magnetism_matcher.cc',
+      'wm/common/workspace/magnetism_matcher.h',
+      'wm/common/workspace/multi_window_resize_controller.cc',
+      'wm/common/workspace/multi_window_resize_controller.h',
+      'wm/common/workspace/phantom_window_controller.cc',
+      'wm/common/workspace/phantom_window_controller.h',
+      'wm/common/workspace/two_step_edge_cycler.cc',
+      'wm/common/workspace/two_step_edge_cycler.h',
+      'wm/common/workspace/workspace_layout_manager.cc',
+      'wm/common/workspace/workspace_layout_manager.h',
+      'wm/common/workspace/workspace_layout_manager_backdrop_delegate.h',
+      'wm/common/workspace/workspace_layout_manager_delegate.h',
+      'wm/common/workspace/workspace_types.h',
+      'wm/common/workspace/workspace_window_resizer.cc',
+      'wm/common/workspace/workspace_window_resizer.h',
       'wm/cursor_manager_chromeos.cc',
       'wm/cursor_manager_chromeos.h',
       'wm/dim_window.cc',
@@ -972,7 +1062,6 @@
         '../url/url.gyp:url_lib',
         'ash_resources.gyp:ash_resources',
         'ash_strings.gyp:ash_strings',
-        'wm/common/ash_wm_common.gyp:ash_wm_common',
         'wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
       ],
       'defines': [
@@ -1069,7 +1158,6 @@
         'ash',
         'ash_resources.gyp:ash_resources',
         'ash_strings.gyp:ash_strings',
-        'wm/common/ash_wm_common.gyp:ash_wm_common',
       ],
       'defines': [
         'ASH_WITH_CONTENT_IMPLEMENTATION',
@@ -1184,7 +1272,6 @@
         'ash_strings.gyp:ash_test_strings',
         'ash_test_support',
         'ash_with_content',
-        'wm/common/ash_wm_common.gyp:ash_wm_common',
       ],
       'sources': [
         '<@(ash_unittests_sources)',
@@ -1286,7 +1373,6 @@
         '../content/content_shell_and_tests.gyp:content_shell_lib',
         '../content/content.gyp:content',
         '../skia/skia.gyp:skia',
-        'wm/common/ash_wm_common.gyp:ash_wm_common',
       ],
       'sources': [
         '<@(ash_shell_with_content_lib_sources)',