Moves ash/wm/common/resources back to ash

ash/wm/common/workspace/multi_window_resize_controller.cc

 // 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.
 
 #include "ash/wm/common/workspace/multi_window_resize_controller.h"
 
 #include "ash/wm/common/wm_lookup.h"
 #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 "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"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/compound_event_filter.h"
@@ skipping 37 matching lines @@
 }  // namespace
 
 // View contained in the widget. Passes along mouse events to the
 // MultiWindowResizeController so that it can start/stop the resize loop.
 class MultiWindowResizeController::ResizeView : public views::View {
  public:
   explicit ResizeView(MultiWindowResizeController* controller,
                       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();
   }
 
   // views::View overrides:
   gfx::Size GetPreferredSize() const override {
     return gfx::Size(image_->width(), image_->height());
   }
   void OnPaint(gfx::Canvas* canvas) override {
     canvas->DrawImageInt(*image_, 0, 0);
   }
@@ skipping 451 matching lines @@
 
 bool MultiWindowResizeController::IsOverComponent(
     wm::WmWindow* window,
     const gfx::Point& location_in_screen,
     int component) const {
   gfx::Point window_loc = window->ConvertPointFromScreen(location_in_screen);
   return window->GetNonClientComponent(window_loc) == component;
 }
 
 }  // namespace ash