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

7 files changed, 7 insertions, 7 deletions

diff --git a/ash/launcher/app_list_button.cc b/ash/launcher/app_list_button.cc
index 3a551ed..7fc3eac 100644
--- a/ash/launcher/app_list_button.cc
+++ b/ash/launcher/app_list_button.cc
@@ -8,8 +8,8 @@
 
 #include "ash/launcher/launcher_button_host.h"
 #include "ash/launcher/launcher_types.h"
-#include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
+#include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index 73df792..17addd0 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -16,7 +16,7 @@
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/shelf_layout_manager.h"
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index a3848ab..e271e64 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "ash/launcher/launcher_button_host.h"
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/animation_delegate.h"
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index e5e493a..8918838 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -20,7 +20,7 @@
 #include "base/auto_reset.h"
 #include "base/memory/scoped_ptr.h"
 #include "grit/ash_strings.h"
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc
index 0c18eb2..0a260f5 100644
--- a/ash/launcher/launcher_view_unittest.cc
+++ b/ash/launcher/launcher_view_unittest.cc
@@ -19,7 +19,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
diff --git a/ash/launcher/overflow_button.cc b/ash/launcher/overflow_button.cc
index c06d448..4ff8432 100644
--- a/ash/launcher/overflow_button.cc
+++ b/ash/launcher/overflow_button.cc
@@ -4,8 +4,8 @@
 
 #include "ash/launcher/overflow_button.h"
 
-#include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
+#include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/animation/throb_animation.h"
diff --git a/ash/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc
index 75f62e2..5e6ab7d 100644
--- a/ash/launcher/tabbed_launcher_button.cc
+++ b/ash/launcher/tabbed_launcher_button.cc
@@ -8,7 +8,7 @@
 
 #include "ash/launcher/launcher_button_host.h"
 #include "ash/launcher/launcher_types.h"
-#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/multi_animation.h"
 #include "ui/base/resource/resource_bundle.h"