Moves ash/wm/common/resources back to ash

ash/ash_resources.gyp

 # Copyright 2014 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.
 
 {
   'targets': [
     {
       # GN version: //ash/resources
       'target_name': 'ash_resources',
       'type': 'none',
@@ skipping 14 matching lines @@
     {
       # Creates a 100% pak file containing resources for ash_unittests, etc.
       # TODO(msw): Use ui_test.pak instead of its pieces? (no 200% support?)
       # TODO(msw): Add copy steps and mac handling like repack_ui_test_pack?
       # GN version: //ash/resources:ash_test_resources_100_percent
       'target_name': 'ash_test_resources_100_percent',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         'ash_resources',
-        '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
       ],
       'actions': [
         {
           'action_name': 'repack_ash_test_resources',
           'variables': {
             'pak_output': '<(PRODUCT_DIR)/ash_test_resources_100_percent.pak',
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ash/wm/common/resources/ash_wm_common_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
             ],
             'conditions': [
               ['chromeos==1', {
                 'pak_inputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',
                 ],
               }],
               ['toolkit_views==1', {
@@ skipping 25 matching lines @@
     {
       # Creates a 200% pak file containing resources for ash_unittests, etc.
       # TODO(msw): Use ui_test.pak instead of its pieces? (no 200% support?)
       # TODO(msw): Add copy steps and mac handling like repack_ui_test_pack?
       # GN version: //ash/resources:ash_test_resources_200_percent
       'target_name': 'ash_test_resources_200_percent',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         'ash_resources',
-        '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
       ],
       'actions': [
         {
           'action_name': 'repack_ash_test_resources',
           'variables': {
             'pak_output': '<(PRODUCT_DIR)/ash_test_resources_200_percent.pak',
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_200_percent.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ash/wm/common/resources/ash_wm_common_resources_200_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak',
             ],
             'conditions': [
               ['chromeos==1', {
                 'pak_inputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_200_percent.pak',
                 ],
               }],
               ['toolkit_views==1', {
                 'pak_inputs': [
@@ skipping 14 matching lines @@
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources',
           ],
         }],
       ],
     },
   ],
 }