Revert r156610 "add ash_resources.grd and necessary changes to use images in ash/resources"

TBR=oshima@chromium.org
BUG=146034
TEST=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156614 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 9 insertions, 9 deletions

diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc
index 7aba0b4..12c3542 100644
--- a/ash/wm/custom_frame_view_ash.cc
+++ b/ash/wm/custom_frame_view_ash.cc
@@ -6,7 +6,7 @@
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "grit/ui_strings.h"  // Accessibility names
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index 89a0ed73..01f3a80 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -11,7 +11,7 @@
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/logging.h"  // DCHECK
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
diff --git a/ash/wm/frame_painter_unittest.cc b/ash/wm/frame_painter_unittest.cc
index 88da751..870761e 100644
--- a/ash/wm/frame_painter_unittest.cc
+++ b/ash/wm/frame_painter_unittest.cc
@@ -9,7 +9,7 @@
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/hit_test.h"
diff --git a/ash/wm/image_cursors.cc b/ash/wm/image_cursors.cc
index c893fdc..b0ec3f5 100644
--- a/ash/wm/image_cursors.cc
+++ b/ash/wm/image_cursors.cc
@@ -8,7 +8,6 @@
 #include "ui/base/cursor/cursor_loader.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/gfx/point.h"
-#include "grit/ash_resources.h"
 #include "grit/ui_resources.h"
 
 namespace {
diff --git a/ash/wm/maximize_bubble_controller.cc b/ash/wm/maximize_bubble_controller.cc
index 6f66278..16d0422 100644
--- a/ash/wm/maximize_bubble_controller.cc
+++ b/ash/wm/maximize_bubble_controller.cc
@@ -9,8 +9,8 @@
 #include "ash/wm/window_animations.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "base/timer.h"
-#include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
+#include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/window.h"
diff --git a/ash/wm/panel_frame_view.cc b/ash/wm/panel_frame_view.cc
index fee4988..90a79b3 100644
--- a/ash/wm/panel_frame_view.cc
+++ b/ash/wm/panel_frame_view.cc
@@ -4,7 +4,7 @@
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/panel_frame_view.h"
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "grit/ui_strings.h"  // Accessibility names
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/animation/throb_animation.h"
diff --git a/ash/wm/resize_shadow.cc b/ash/wm/resize_shadow.cc
index 95ed9f1..805783f 100644
--- a/ash/wm/resize_shadow.cc
+++ b/ash/wm/resize_shadow.cc
@@ -6,7 +6,7 @@
 
 #include "ash/wm/image_grid.h"
 #include "base/time.h"
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/wm/shadow.cc b/ash/wm/shadow.cc
index 2f720c6..7cd2fea 100644
--- a/ash/wm/shadow.cc
+++ b/ash/wm/shadow.cc
@@ -5,7 +5,7 @@
 #include "ash/wm/shadow.h"
 
 #include "ash/wm/image_grid.h"
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 
diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc
index 1ffa5b8..1654068b 100644
--- a/ash/wm/workspace/frame_maximize_button.cc
+++ b/ash/wm/workspace/frame_maximize_button.cc
@@ -12,6 +12,7 @@
 #include "ash/wm/workspace/phantom_window_controller.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "grit/ash_strings.h"
+#include "grit/ui_resources.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
index 35b8122..e9dc788 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -10,7 +10,7 @@
 #include "ash/wm/window_animations.h"
 #include "ash/wm/workspace/workspace_event_handler.h"
 #include "ash/wm/workspace/workspace_window_resizer.h"
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/root_window.h"