Moves ash/wm/common back into ash

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 526 matching lines @@
       '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/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',
       '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',
@@ skipping 413 matching lines @@
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/native_theme/native_theme.gyp:native_theme',
         '../ui/platform_window/stub/stub_window.gyp:stub_window',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
         '../ui/views/views.gyp:views',
         '../ui/wm/wm.gyp:wm',
         '../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': [
         'ASH_IMPLEMENTATION',
       ],
       'sources': [
         '<@(ash_sources)',
       ],
       'conditions': [
         ['OS=="win"', {
@@ skipping 76 matching lines @@
         '../ui/keyboard/keyboard.gyp:keyboard_with_content',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
         '../ui/views/controls/webview/webview.gyp:webview',
         '../ui/views/views.gyp:views',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../url/url.gyp:url_lib',
         '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',
       ],
       'sources': [
         '<@(ash_with_content_sources)',
       ],
     },
     {
       # GN version: //ash:test_support
@@ skipping 94 matching lines @@
         '../ui/wm/wm.gyp:wm',
         '../url/url.gyp:url_lib',
         'ash',
         'ash_resources.gyp:ash_resources',
         'ash_resources.gyp:ash_test_resources_100_percent',
         'ash_resources.gyp:ash_test_resources_200_percent',
         'ash_strings.gyp:ash_strings',
         '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)',
       ],
       'conditions': [
         ['chromeos==0', {
           'sources!': [
             # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
             'focus_cycler_unittest.cc',
 
@@ skipping 81 matching lines @@
     },
     {
       # GN version: //ash:ash_shell_lib_with_content
       'target_name': 'ash_shell_lib_with_content',
       'type': 'static_library',
       'dependencies': [
         'ash_shell_lib',
         '../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)',
       ],
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
             '../content/content.gyp:sandbox_helper_win',
           ],
         }],
@@ skipping 51 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }