Moves ash/wm/common/resources back to ash

ash/wm/common/dock/docked_window_layout_manager.cc

Index: ash/wm/common/dock/docked_window_layout_manager.cc
diff --git a/ash/wm/common/dock/docked_window_layout_manager.cc b/ash/wm/common/dock/docked_window_layout_manager.cc
index 84a87160b69917fb655ea6a0d4950d59a8a79be5..9a9434492baa15438cfb2c6c040ff87b2d66e828 100644
--- a/ash/wm/common/dock/docked_window_layout_manager.cc
+++ b/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(