Moves ash/wm/common/resources back to ash

We decided on a different approach that doesn't require splitting
these out.

This is a revert of https://codereview.chromium.org/1994993003 .

BUG=616265
TEST=none
R=oshima@chromium.org, thestig@chromium.org

Review-Url: https://codereview.chromium.org/2026973002
Cr-Commit-Position: refs/heads/master@{#397033}

ash/BUILD.gn

@@ -24,7 +24,6 @@ component("ash") {
   public_deps = [
     "//ash/resources",
     "//ash/strings",
-    "//ash/wm/common/resources",
   ]
   deps = [
     "//base",
@@ -192,7 +191,6 @@ source_set("test_support") {
   deps = [
     ":test_support_with_content",  # TODO(beng): reverse this direction.
     "//ash/resources",
-    "//ash/wm/common/resources",
     "//base:i18n",
     "//base/test:test_support",
     "//components/signin/core/account_id",
@@ -283,7 +281,6 @@ static_library("ash_shell_lib") {
     ":test_support",
     "//ash/resources",
     "//ash/strings",
-    "//ash/wm/common/resources",
     "//base",
     "//base:i18n",
     "//components/user_manager",
@@ -351,7 +348,6 @@ test("ash_unittests") {
     ":test_support_with_content",
     "//ash/resources",
     "//ash/strings",
-    "//ash/wm/common/resources",
     "//base",
     "//base/test:test_support",
     "//components/signin/core/account_id",

ash/DEPS

@@ -9,7 +9,6 @@ include_rules = [
   "+gpu/config",
   "+grit/ash_resources.h",
   "+grit/ash_strings.h",
-  "+grit/ash_wm_common_resources.h",
   "+media",
   "+skia/ext",
   "+third_party/cros_system_api",

ash/ash.gyp

@@ -1069,7 +1069,6 @@
         '../url/url.gyp:url_lib',
         'ash_resources.gyp:ash_resources',
         'ash_strings.gyp:ash_strings',
-        'wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
       ],
       'defines': [
         'ASH_IMPLEMENTATION',

ash/ash_resources.gyp

@@ -32,7 +32,6 @@
       'dependencies': [
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         'ash_resources',
-        '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
       ],
       'actions': [
         {
@@ -41,7 +40,6 @@
             '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',
             ],
@@ -87,7 +85,6 @@
       'dependencies': [
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         'ash_resources',
-        '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
       ],
       'actions': [
         {
@@ -96,7 +93,6 @@
             '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': [

ash/resources/BUILD.gn

@@ -27,7 +27,6 @@ template("ash_test_resources") {
 
     sources = [
       "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak",
-      "$root_gen_dir/ash/wm/common/resources/ash_wm_common_resources_${percent}_percent.pak",
       "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
     ]
 
@@ -39,8 +38,7 @@ template("ash_test_resources") {
     }
 
     deps = [
-      ":resources",
-      "//ash/wm/common/resources",
+      "//ash/resources",
       "//content:resources",
       "//ui/resources",
     ]

ash/resources/ash_resources.grd

@@ -12,6 +12,7 @@
       <!-- KEEP THESE IN ALPHABETICAL ORDER!  DO NOT ADD TO RANDOM PLACES JUST
            BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
            SAME CONDITIONALS. -->
+      <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_BACKGROUND" file="common/shelf/shelf_background.png" />
       <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_CORNER" file="common/shelf/shelf_corner.png" />
       <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_DIMMING" file="common/shelf/shelf_dimming.png" />
       <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_APPLIST" file="common/shelf/status_launcher_menu_icon.png" />
@@ -24,9 +25,20 @@
       <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_UNDERLINE_RUNNING" file="common/shelf/shelf_underline_running.png" />
       <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_SETTINGS" file="common/shelf/settings_app_icon.png" />
       <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_TASK_MANAGER" file="common/shelf/task_manager.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_MULTI_WINDOW_RESIZE_H" file="common/multi_window_resize_horizontal.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_MULTI_WINDOW_RESIZE_V" file="common/multi_window_resize_vertical.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL" file="common/shelf/status_icon_background_normal.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK" file="common/shelf/status_icon_background_onblack_normal.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED" file="common/shelf/status_icon_background_pressed.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_PHANTOM_WINDOW_BOTTOM" file="common/phantom_window_bottom.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_PHANTOM_WINDOW_BOTTOM_LEFT" file="common/phantom_window_bottom_left.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_PHANTOM_WINDOW_BOTTOM_RIGHT" file="common/phantom_window_bottom_right.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_PHANTOM_WINDOW_CENTER" file="common/phantom_window_center.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_PHANTOM_WINDOW_LEFT" file="common/phantom_window_left.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_PHANTOM_WINDOW_RIGHT" file="common/phantom_window_right.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_PHANTOM_WINDOW_TOP" file="common/phantom_window_top.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_PHANTOM_WINDOW_TOP_LEFT" file="common/phantom_window_top_left.png" />
+      <structure type="chrome_scaled_image" name="IDR_AURA_PHANTOM_WINDOW_TOP_RIGHT" file="common/phantom_window_top_right.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_BOTTOM" file="common/resize_shadow_bottom.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_BOTTOM_LEFT" file="common/resize_shadow_bottom_left.png" />
       <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_BOTTOM_RIGHT" file="common/resize_shadow_bottom_right.png" />

ash/shelf/shelf_widget.cc

@@ -26,7 +26,6 @@
 #include "ash/wm/window_properties.h"
 #include "ash/wm/workspace_controller.h"
 #include "grit/ash_resources.h"
-#include "grit/ash_wm_common_resources.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
@@ -453,7 +452,7 @@ void ShelfWidget::DelegateView::SetParentLayer(ui::Layer* layer) {
 void ShelfWidget::DelegateView::OnPaintBackground(gfx::Canvas* canvas) {
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   gfx::ImageSkia shelf_background =
-      *rb->GetImageSkiaNamed(IDR_ASH_WM_COMMON_SHELF_BACKGROUND);
+      *rb->GetImageSkiaNamed(IDR_ASH_SHELF_BACKGROUND);
   const bool horizontal = wm::IsHorizontalAlignment(shelf_->GetAlignment());
   if (!horizontal) {
     shelf_background = gfx::ImageSkiaOperations::CreateRotatedImage(

ash/wm/common/DEPS

@@ -2,8 +2,6 @@ include_rules = [
   "-ash",
   "+ash/ash_export.h",
   "+ash/wm/common",
-  "-grit/ash_resources.h",
-  "+grit/ash_wm_common_resources.h",
   "+ui",
   "-ui/aura",
 ]

ash/wm/common/ash_wm_common.gyp

@@ -8,7 +8,6 @@
       'target_name': 'ash_wm_common',
       'type': '<(component)',
       'dependencies': [
-        'ash_wm_common_resources.gyp:ash_wm_common_resources',
         '../../ash_resources.gyp:ash_resources',
         '../../../base/base.gyp:base',
         '../../../skia/skia.gyp:skia',

ash/wm/common/ash_wm_common_resources.gyp

-# Copyright 2016 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/wm/common/resources
-      'target_name': 'ash_wm_common_resources',
-      'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash/wm/common/resources',
-      },
-      'actions': [
-        {
-          'action_name': 'ash_wm_common_resources',
-          'variables': {
-            'grit_grd_file': 'resources/ash_wm_common_resources.grd',
-          },
-          'includes': [ '../../../build/grit_action.gypi' ],
-        },
-      ],
-      'includes': [ '../../../build/grit_target.gypi' ],
-    },
-  ],
-}

ash/wm/common/dock/docked_window_layout_manager.cc

@@ -18,7 +18,7 @@
 #include "ash/wm/common/wm_window.h"
 #include "base/auto_reset.h"
 #include "base/metrics/histogram.h"
-#include "grit/ash_wm_common_resources.h"
+#include "grit/ash_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -143,7 +143,7 @@ class DockedBackgroundWidget : public views::Widget,
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     gfx::ImageSkia shelf_background =
-        *rb.GetImageSkiaNamed(IDR_ASH_WM_COMMON_SHELF_BACKGROUND);
+        *rb.GetImageSkiaNamed(IDR_ASH_SHELF_BACKGROUND);
     shelf_background_left_ = gfx::ImageSkiaOperations::CreateRotatedImage(
         shelf_background, SkBitmapOperations::ROTATION_90_CW);
     shelf_background_right_ = gfx::ImageSkiaOperations::CreateRotatedImage(

ash/wm/common/resources/BUILD.gn

-# Copyright 2016 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.
-
-import("//tools/grit/grit_rule.gni")
-import("//tools/grit/repack.gni")
-import("//ui/base/ui_features.gni")
-
-assert(enable_hidpi)
-
-grit("resources") {
-  source = "ash_wm_common_resources.grd"
-  outputs = [
-    "grit/ash_wm_common_resources.h",
-    "ash_wm_common_resources_100_percent.pak",
-    "ash_wm_common_resources_200_percent.pak",
-  ]
-}

ash/wm/common/resources/OWNERS

-oshima@chromium.org

ash/wm/common/resources/PRESUBMIT.py

-# 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.
-
-"""Presubmit script for Chromium Ash resources.
-
-See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-for more details about the presubmit API built into depot_tools, and see
-http://www.chromium.org/developers/web-development-style-guide for the rules
-we're checking against here.
-"""
-
-
-def CheckChangeOnUpload(input_api, output_api):
-  return _CommonChecks(input_api, output_api)
-
-
-def CheckChangeOnCommit(input_api, output_api):
-  return _CommonChecks(input_api, output_api)
-
-
-def _CommonChecks(input_api, output_api):
-  """Checks common to both upload and commit."""
-  results = []
-  resources = input_api.os_path.join(input_api.PresubmitLocalPath(),
-      '../../ui/resources')
-
-  # List of paths with their associated scale factor. This is used to verify
-  # that the images modified in one are the correct scale of the other.
-  path_scales = [
-    [(100, 'default_100_percent/'), (200, 'default_200_percent/')],
-  ]
-
-  import sys
-  old_path = sys.path
-
-  try:
-    sys.path = [resources] + old_path
-    from resource_check import resource_scale_factors
-
-    for paths in path_scales:
-      results.extend(resource_scale_factors.ResourceScaleFactors(
-          input_api, output_api, paths).RunChecks())
-  finally:
-    sys.path = old_path
-
-  return results

ash/wm/common/resources/ash_wm_common_resources.grd

-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0" current_release="1">
-  <outputs>
-    <output filename="grit/ash_wm_common_resources.h" type="rc_header" context="default_100_percent">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="ash_wm_common_resources_100_percent.pak" type="data_package" context="default_100_percent" />
-    <output filename="ash_wm_common_resources_200_percent.pak" type="data_package" context="default_200_percent" />
-  </outputs>
-  <release seq="1">
-    <structures fallback_to_low_resolution="true">
-      <!-- KEEP THESE IN ALPHABETICAL ORDER!  DO NOT ADD TO RANDOM PLACES JUST
-           BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
-           SAME CONDITIONALS. -->
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_MULTI_WINDOW_RESIZE_H" file="common/multi_window_resize_horizontal.png" />
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_MULTI_WINDOW_RESIZE_V" file="common/multi_window_resize_vertical.png" />
-      <!-- TODO(sky): I suspect this one should be moved to a common
-           resources directory. -->
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_SHELF_BACKGROUND" file="common/shelf/shelf_background.png" />
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_PHANTOM_WINDOW_BOTTOM" file="common/phantom_window_bottom.png" />
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_PHANTOM_WINDOW_BOTTOM_LEFT" file="common/phantom_window_bottom_left.png" />
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_PHANTOM_WINDOW_BOTTOM_RIGHT" file="common/phantom_window_bottom_right.png" />
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_PHANTOM_WINDOW_CENTER" file="common/phantom_window_center.png" />
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_PHANTOM_WINDOW_LEFT" file="common/phantom_window_left.png" />
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_PHANTOM_WINDOW_RIGHT" file="common/phantom_window_right.png" />
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_PHANTOM_WINDOW_TOP" file="common/phantom_window_top.png" />
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_PHANTOM_WINDOW_TOP_LEFT" file="common/phantom_window_top_left.png" />
-      <structure type="chrome_scaled_image" name="IDR_ASH_WM_COMMON_PHANTOM_WINDOW_TOP_RIGHT" file="common/phantom_window_top_right.png" />
-    </structures>
-  </release>
-</grit>

ash/wm/common/workspace/multi_window_resize_controller.cc

@@ -9,7 +9,7 @@
 #include "ash/wm/common/wm_shell_window_ids.h"
 #include "ash/wm/common/wm_window.h"
 #include "ash/wm/common/workspace/workspace_window_resizer.h"
-#include "grit/ash_wm_common_resources.h"
+#include "grit/ash_resources.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -67,9 +67,8 @@ class MultiWindowResizeController::ResizeView : public views::View {
                       Direction direction)
       : controller_(controller), direction_(direction), image_(NULL) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    int image_id = direction == TOP_BOTTOM
-                       ? IDR_ASH_WM_COMMON_MULTI_WINDOW_RESIZE_H
-                       : IDR_ASH_WM_COMMON_MULTI_WINDOW_RESIZE_V;
+    int image_id = direction == TOP_BOTTOM ? IDR_AURA_MULTI_WINDOW_RESIZE_H
+                                           : IDR_AURA_MULTI_WINDOW_RESIZE_V;
     image_ = rb.GetImageNamed(image_id).ToImageSkia();
   }
 

ash/wm/common/workspace/phantom_window_controller.cc

@@ -11,7 +11,7 @@
 #include "ash/wm/common/wm_root_window_controller.h"
 #include "ash/wm/common/wm_shell_window_ids.h"
 #include "ash/wm/common/wm_window.h"
-#include "grit/ash_wm_common_resources.h"
+#include "grit/ash_resources.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/background.h"
@@ -34,8 +34,7 @@ const float kStartBoundsRatio = 0.85f;
 const int kShadowThickness = 15;
 
 // The minimum size of a phantom window including the shadow. The minimum size
-// is derived from the size of the IDR_ASH_WM_COMMON_PHANTOM_WINDOW image
-// assets.
+// is derived from the size of the IDR_AURA_PHANTOM_WINDOW image assets.
 const int kMinSizeWithShadow = 100;
 
 // Adjusts the phantom window's bounds so that the bounds:
@@ -133,7 +132,7 @@ std::unique_ptr<views::Widget> PhantomWindowController::CreatePhantomWidget(
                                                         window_);
   }
 
-  const int kImages[] = IMAGE_GRID(IDR_ASH_WM_COMMON_PHANTOM_WINDOW);
+  const int kImages[] = IMAGE_GRID(IDR_AURA_PHANTOM_WINDOW);
   views::Painter* background_painter =
       views::Painter::CreateImageGridPainter(kImages);
   views::View* content_view = new views::View;

chrome/BUILD.gn

@@ -1299,14 +1299,9 @@ template("chrome_repack_percent") {
       ]
     }
     if (use_ash) {
-      sources += [
-        "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak",
-        "$root_gen_dir/ash/wm/common/resources/ash_wm_common_resources_${percent}_percent.pak",
-      ]
-      deps += [
-        "//ash/resources",
-        "//ash/wm/common/resources",
-      ]
+      sources +=
+          [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ]
+      deps += [ "//ash/resources" ]
     }
     if (toolkit_views) {
       sources += [ "$root_gen_dir/ui/views/resources/views_resources_${percent}_percent.pak" ]

chrome/app/mash/BUILD.gn

@@ -10,6 +10,7 @@ source_set("mash") {
     "mash_runner.h",
   ]
   deps = [
+    "//ash/resources",
     "//ash/sysui:lib",
     "//base:i18n",
     "//components/mus:lib",

chrome/browser/chromeos/BUILD.gn

@@ -23,7 +23,6 @@ source_set("chromeos") {
   public_deps = [
     "//ash/resources",
     "//ash/strings",
-    "//ash/wm/common/resources",
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
@@ -193,7 +192,6 @@ source_set("unit_tests") {
     ":attestation_proto",
     ":device_policy_proto",
     "//ash/resources",
-    "//ash/wm/common/resources",
     "//components/drive",
     "//components/drive:test_support_chromeos",
     "//components/invalidation/public",

chrome/browser/ui/BUILD.gn

@@ -359,7 +359,6 @@ source_set("ui") {
     deps += [
       # aura uses some of ash resources.
       "//ash/resources",
-      "//ash/wm/common/resources",
       "//ui/aura",
       "//ui/keyboard",
       "//ui/keyboard:keyboard_with_content",

chrome/chrome_browser_chromeos.gypi

@@ -1280,7 +1280,6 @@
             '../ash/ash.gyp:ash_with_content',
             '../ash/ash_resources.gyp:ash_resources',
             '../ash/ash_strings.gyp:ash_strings',
-            '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
             '../components/components.gyp:session_manager_component',
             '../components/components.gyp:user_manager',
             '../ui/app_list/app_list.gyp:app_list',

chrome/chrome_browser_ui.gypi

@@ -3063,7 +3063,6 @@
           'dependencies': [
             # aura uses some of ash resources.
             '../ash/ash_resources.gyp:ash_resources',
-            '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
             '../ui/aura/aura.gyp:aura',
             '../ui/keyboard/keyboard.gyp:keyboard',
             '../ui/keyboard/keyboard.gyp:keyboard_with_content',

chrome/chrome_repack_chrome_100_percent.gypi

@@ -27,7 +27,6 @@
       ['use_ash==1', {
         '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',
         ],
       }],
       ['chromeos==1', {

chrome/chrome_repack_chrome_200_percent.gypi

@@ -27,7 +27,6 @@
       ['use_ash==1', {
         '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',
         ],
       }],
       ['chromeos==1', {

chrome/chrome_resources.gyp

@@ -567,7 +567,6 @@
           'dependencies': [  # Update duplicate logic in repack_locales.py
              '<(DEPTH)/ash/ash_resources.gyp:ash_resources',
              '<(DEPTH)/ash/ash_strings.gyp:ash_strings',
-            '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
           ],
         }],
         ['toolkit_views==1', {

chrome/chrome_tests.gypi

@@ -1818,7 +1818,6 @@
         ['chromeos==1', {
           'dependencies': [
             '../ash/ash_resources.gyp:ash_resources',
-            '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
             '../chromeos/chromeos.gyp:chromeos',
           ],
           'conditions': [

chrome/chrome_tests_unit.gypi

@@ -2415,7 +2415,6 @@
             '../ash/ash.gyp:ash_test_support',
             '../ash/ash_resources.gyp:ash_resources',
             '../ash/ash_strings.gyp:ash_strings',
-            '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resources',
           ],
           # We eventually want to compile both in Win Aura builds, see
           # http://crbug.com/155545.

chrome/test/BUILD.gn

@@ -469,7 +469,6 @@ if (!is_android) {
 
       deps += [
         "//ash/resources",
-        "//ash/wm/common/resources",
         "//chromeos",
       ]
 
@@ -1882,7 +1881,6 @@ test("unit_tests") {
       "//ash:test_support",
       "//ash/resources",
       "//ash/strings",
-      "//ash/wm/common/resources",
     ]
 
     # We eventually want to compile both in Win Aura builds, see

mash/wm/BUILD.gn

@@ -137,7 +137,6 @@ mojo_application_manifest("manifest") {
 
 repack("resources") {
   sources = [
-    "$root_gen_dir/ash/wm/common/resources/ash_wm_common_resources_100_percent.pak",
     "$root_gen_dir/mash/wm/resources/mash_wm_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
@@ -146,7 +145,6 @@ repack("resources") {
   ]
   output = "$root_out_dir/mash_wm_resources.pak"
   deps = [
-    "//ash/wm/common/resources",
     "//mash/wm/resources",
     "//ui/resources",
     "//ui/strings",

tools/gritsettings/resource_ids

@@ -64,9 +64,6 @@
     "includes": [6100],
     "structures": [6150],
   },
-  "ash/wm/common/resources/ash_wm_common_resources.grd": {
-    "structures": [6700],
-  },
   "ui/keyboard/keyboard_resources.grd": {
     "includes": [6850],
   },