Revert 52144 - Clean up app_resources.grd:

* Alphabetize a couple entries
* Move things to theme_resources.grd where possible
* Scope things only used by views under an appropriate conditional

Reverting becasue it definitely causes ExtensionBrowserTest.Toolstrip to crash,
and apparently causes crashes in the startup_tests too.

TBR=pkasting

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2953005

TBR=pkasting@chromium.org
Review URL: http://codereview.chromium.org/2897012

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

30 files changed, 0 insertions, 33 deletions

diff --git a/chrome/app/theme/infobarbutton_b_h.png b/chrome/app/theme/infobarbutton_b_h.png
deleted file mode 100644
index dbca1b9..0000000
--- a/chrome/app/theme/infobarbutton_b_h.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_b_n.png b/chrome/app/theme/infobarbutton_b_n.png
deleted file mode 100644
index 9c83bde..0000000
--- a/chrome/app/theme/infobarbutton_b_n.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_b_p.png b/chrome/app/theme/infobarbutton_b_p.png
deleted file mode 100644
index e8337a7..0000000
--- a/chrome/app/theme/infobarbutton_b_p.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_bl_h.png b/chrome/app/theme/infobarbutton_bl_h.png
deleted file mode 100644
index b621248..0000000
--- a/chrome/app/theme/infobarbutton_bl_h.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_bl_n.png b/chrome/app/theme/infobarbutton_bl_n.png
deleted file mode 100644
index b151024..0000000
--- a/chrome/app/theme/infobarbutton_bl_n.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_bl_p.png b/chrome/app/theme/infobarbutton_bl_p.png
deleted file mode 100644
index 382bb94..0000000
--- a/chrome/app/theme/infobarbutton_bl_p.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_br_h.png b/chrome/app/theme/infobarbutton_br_h.png
deleted file mode 100644
index 202e335..0000000
--- a/chrome/app/theme/infobarbutton_br_h.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_br_n.png b/chrome/app/theme/infobarbutton_br_n.png
deleted file mode 100644
index 1b89dd6..0000000
--- a/chrome/app/theme/infobarbutton_br_n.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_br_p.png b/chrome/app/theme/infobarbutton_br_p.png
deleted file mode 100644
index e6eaf529..0000000
--- a/chrome/app/theme/infobarbutton_br_p.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_c_h.png b/chrome/app/theme/infobarbutton_c_h.png
deleted file mode 100644
index f43ea7f..0000000
--- a/chrome/app/theme/infobarbutton_c_h.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_c_n.png b/chrome/app/theme/infobarbutton_c_n.png
deleted file mode 100644
index 17b9b6d..0000000
--- a/chrome/app/theme/infobarbutton_c_n.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_c_p.png b/chrome/app/theme/infobarbutton_c_p.png
deleted file mode 100644
index 7e1a1fcf..0000000
--- a/chrome/app/theme/infobarbutton_c_p.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_l_h.png b/chrome/app/theme/infobarbutton_l_h.png
deleted file mode 100644
index b41b437..0000000
--- a/chrome/app/theme/infobarbutton_l_h.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_l_n.png b/chrome/app/theme/infobarbutton_l_n.png
deleted file mode 100644
index 9209c58..0000000
--- a/chrome/app/theme/infobarbutton_l_n.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_l_p.png b/chrome/app/theme/infobarbutton_l_p.png
deleted file mode 100644
index efbd771..0000000
--- a/chrome/app/theme/infobarbutton_l_p.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_menu_droparrow.png b/chrome/app/theme/infobarbutton_menu_droparrow.png
deleted file mode 100644
index c9b183a..0000000
--- a/chrome/app/theme/infobarbutton_menu_droparrow.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_r_h.png b/chrome/app/theme/infobarbutton_r_h.png
deleted file mode 100644
index 85634d7..0000000
--- a/chrome/app/theme/infobarbutton_r_h.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_r_n.png b/chrome/app/theme/infobarbutton_r_n.png
deleted file mode 100644
index 03d6e18..0000000
--- a/chrome/app/theme/infobarbutton_r_n.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_r_p.png b/chrome/app/theme/infobarbutton_r_p.png
deleted file mode 100644
index 75b7e56..0000000
--- a/chrome/app/theme/infobarbutton_r_p.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_t_h.png b/chrome/app/theme/infobarbutton_t_h.png
deleted file mode 100644
index 1016c6d..0000000
--- a/chrome/app/theme/infobarbutton_t_h.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_t_n.png b/chrome/app/theme/infobarbutton_t_n.png
deleted file mode 100644
index 268186b..0000000
--- a/chrome/app/theme/infobarbutton_t_n.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_t_p.png b/chrome/app/theme/infobarbutton_t_p.png
deleted file mode 100644
index bc91279..0000000
--- a/chrome/app/theme/infobarbutton_t_p.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_tl_h.png b/chrome/app/theme/infobarbutton_tl_h.png
deleted file mode 100644
index 587b10c..0000000
--- a/chrome/app/theme/infobarbutton_tl_h.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_tl_n.png b/chrome/app/theme/infobarbutton_tl_n.png
deleted file mode 100644
index 1a65a95..0000000
--- a/chrome/app/theme/infobarbutton_tl_n.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_tl_p.png b/chrome/app/theme/infobarbutton_tl_p.png
deleted file mode 100644
index 374f3a0..0000000
--- a/chrome/app/theme/infobarbutton_tl_p.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_tr_h.png b/chrome/app/theme/infobarbutton_tr_h.png
deleted file mode 100644
index b6d88ed..0000000
--- a/chrome/app/theme/infobarbutton_tr_h.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_tr_n.png b/chrome/app/theme/infobarbutton_tr_n.png
deleted file mode 100644
index 08598d3..0000000
--- a/chrome/app/theme/infobarbutton_tr_n.png
+++ /dev/null
diff --git a/chrome/app/theme/infobarbutton_tr_p.png b/chrome/app/theme/infobarbutton_tr_p.png
deleted file mode 100644
index d4d6278..0000000
--- a/chrome/app/theme/infobarbutton_tr_p.png
+++ /dev/null
diff --git a/chrome/app/theme/input_alert.png b/chrome/app/theme/input_alert.png
deleted file mode 100644
index 503a545..0000000
--- a/chrome/app/theme/input_alert.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 0cc038e..f8ee778 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -198,7 +198,6 @@
         <include name="IDR_INFOBAR_TRANSLATE" file="chromium/infobar_translate.png" type="BINDATA" />
       </if>
       <include name="IDR_INFO_BUBBLE_CLOSE" file="bubble_close.png" type="BINDATA" />
-      <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" />
       <include name="IDR_LOCATIONBG_C" file="locationbg_c.png" type="BINDATA" />
       <include name="IDR_LOCATIONBG_L" file="locationbg_l.png" type="BINDATA" />
       <include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="locationbg_readonly_center.png" type="BINDATA" />
@@ -430,38 +429,6 @@
         <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" />
       </if>
 
-      <!-- Images only used by the Views toolkit. -->
-      <if expr="pp_ifdef('toolkit_views')">
-        <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_H" file="infobarbutton_bl_h.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_N" file="infobarbutton_bl_n.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_BOTTOM_LEFT_P" file="infobarbutton_bl_p.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_BOTTOM_H" file="infobarbutton_b_h.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_BOTTOM_N" file="infobarbutton_b_n.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_BOTTOM_P" file="infobarbutton_b_p.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_H" file="infobarbutton_br_h.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_N" file="infobarbutton_br_n.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_BOTTOM_RIGHT_P" file="infobarbutton_br_p.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_CENTER_H" file="infobarbutton_c_h.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_CENTER_N" file="infobarbutton_c_n.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_CENTER_P" file="infobarbutton_c_p.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_LEFT_H" file="infobarbutton_l_h.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_LEFT_P" file="infobarbutton_l_p.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_LEFT_N" file="infobarbutton_l_n.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_MENU_DROPARROW" file="infobarbutton_menu_droparrow.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_RIGHT_H" file="infobarbutton_r_h.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_RIGHT_N" file="infobarbutton_r_n.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_RIGHT_P" file="infobarbutton_r_p.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_TOP_H" file="infobarbutton_t_h.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_TOP_LEFT_H" file="infobarbutton_tl_h.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_TOP_LEFT_N" file="infobarbutton_tl_n.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_TOP_LEFT_P" file="infobarbutton_tl_p.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_TOP_N" file="infobarbutton_t_n.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_TOP_P" file="infobarbutton_t_p.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_TOP_RIGHT_H" file="infobarbutton_tr_h.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_TOP_RIGHT_N" file="infobarbutton_tr_n.png" type="BINDATA" />
-        <include name="IDR_INFOBARBUTTON_TOP_RIGHT_P" file="infobarbutton_tr_p.png" type="BINDATA" />
-      </if>
-
       <if expr="pp_ifdef('chromeos')">
         <include name="IDR_NOTIFICATION_MENU" file="notification_menu.png" type="BINDATA" />
       </if>