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, 41 insertions, 13 deletions

diff --git a/app/resources/app_resources.grd b/app/resources/app_resources.grd
index e45ac78..3887a67 100644
--- a/app/resources/app_resources.grd
+++ b/app/resources/app_resources.grd
@@ -10,6 +10,8 @@
   <release seq="1">
     <includes>
       <include name="IDR_APP_TOP_CENTER" file="app_top_center.png" type="BINDATA" />
+      <include name="IDR_APP_TOP_LEFT" file="app_top_left.png" type="BINDATA" />
+      <include name="IDR_APP_TOP_RIGHT" file="app_top_right.png" type="BINDATA" />
       <include name="IDR_BROWSER_ACTION_BADGE_CENTER" file="browser_action_badge_center.png" type="BINDATA" />
       <include name="IDR_BROWSER_ACTION_BADGE_LEFT" file="browser_action_badge_left.png" type="BINDATA" />
       <include name="IDR_BROWSER_ACTION_BADGE_RIGHT" file="browser_action_badge_right.png" type="BINDATA" />
@@ -17,11 +19,17 @@
         <include name="IDR_CLOSE" file="close.png" type="BINDATA" />
         <include name="IDR_CLOSE_H" file="close_h.png" type="BINDATA" />
         <include name="IDR_CLOSE_P" file="close_p.png" type="BINDATA" />
+        <include name="IDR_CLOSE_SA" file="close_sa.png" type="BINDATA" />
+        <include name="IDR_CLOSE_SA_H" file="close_sa_h.png" type="BINDATA" />
+        <include name="IDR_CLOSE_SA_P" file="close_sa_p.png" type="BINDATA" />
       </if>
       <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)">
         <include name="IDR_CLOSE" file="linux_close.png" type="BINDATA" />
         <include name="IDR_CLOSE_H" file="linux_close_h.png" type="BINDATA" />
         <include name="IDR_CLOSE_P" file="linux_close_p.png" type="BINDATA" />
+        <include name="IDR_CLOSE_SA" file="linux_close.png" type="BINDATA" />
+        <include name="IDR_CLOSE_SA_H" file="linux_close_h.png" type="BINDATA" />
+        <include name="IDR_CLOSE_SA_P" file="linux_close_p.png" type="BINDATA" />
       </if>
       <include name="IDR_CONTENT_BOTTOM_CENTER" file="content_bottom_center.png" type="BINDATA" />
       <include name="IDR_CONTENT_BOTTOM_LEFT_CORNER" file="content_bottom_left_corner.png" type="BINDATA" />
@@ -36,6 +44,35 @@
       <include name="IDR_FRAME" file="frame_default.png" type="BINDATA" />
       <include name="IDR_FRAME_APP_PANEL" file="frame_app_panel_default.png" type="BINDATA" />
       <include name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" type="BINDATA" />
+      <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_N" file="infobarbutton_l_n.png" type="BINDATA" />
+      <include name="IDR_INFOBARBUTTON_LEFT_P" file="infobarbutton_l_p.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" />
+      <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" />
       <include name="IDR_INPUT_GOOD" file="input_good.png" type="BINDATA" />
       <if expr="pp_ifdef('toolkit_views')">
         <include name="IDR_MAXIMIZE" file="maximize.png" type="BINDATA" />
@@ -47,6 +84,8 @@
         <include name="IDR_MAXIMIZE_H" file="linux_maximize_h.png" type="BINDATA" />
         <include name="IDR_MAXIMIZE_P" file="linux_maximize_p.png" type="BINDATA" />
       </if>
+      <include name="IDR_MENU_ARROW" file="menu_arrow.png" type="BINDATA" />
+      <include name="IDR_MENU_CHECK" file="menu_check.png" type="BINDATA" />
       <include name="IDR_MENU_DROPARROW" file="menu_droparrow.png" type="BINDATA" />
       <if expr="pp_ifdef('toolkit_views')">
         <include name="IDR_MINIMIZE" file="minimize.png" type="BINDATA" />
@@ -69,9 +108,9 @@
         <include name="IDR_RESTORE_H" file="linux_restore_h.png" type="BINDATA" />
         <include name="IDR_RESTORE_P" file="linux_restore_p.png" type="BINDATA" />
       </if>
-      <include name="IDR_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_P" file="textbutton_bl_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_BOTTOM_P" file="textbutton_b_p.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_h.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_P" file="textbutton_br_p.png" type="BINDATA" />
@@ -81,9 +120,9 @@
       <include name="IDR_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.png" type="BINDATA" />
-      <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_TOP_LEFT_P" file="textbutton_tl_p.png" type="BINDATA" />
+      <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_TOP_P" file="textbutton_t_p.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_TOP_RIGHT_P" file="textbutton_tr_p.png" type="BINDATA" />
@@ -96,17 +135,6 @@
       <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" />
       <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" />
       <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" />
-
-      <!-- Images only used by the Views toolkit. -->
-      <if expr="pp_ifdef('toolkit_views')">
-        <include name="IDR_APP_TOP_LEFT" file="app_top_left.png" type="BINDATA" />
-        <include name="IDR_APP_TOP_RIGHT" file="app_top_right.png" type="BINDATA" />
-        <include name="IDR_CLOSE_SA" file="close_sa.png" type="BINDATA" />
-        <include name="IDR_CLOSE_SA_H" file="close_sa_h.png" type="BINDATA" />
-        <include name="IDR_CLOSE_SA_P" file="close_sa_p.png" type="BINDATA" />
-        <include name="IDR_MENU_ARROW" file="menu_arrow.png" type="BINDATA" />
-        <include name="IDR_MENU_CHECK" file="menu_check.png" type="BINDATA" />
-      </if>
     </includes>
   </release>
 </grit>
diff --git a/app/resources/infobarbutton_b_h.png b/app/resources/infobarbutton_b_h.png
new file mode 100644
index 0000000..dbca1b9
--- /dev/null
+++ b/app/resources/infobarbutton_b_h.png
diff --git a/app/resources/infobarbutton_b_n.png b/app/resources/infobarbutton_b_n.png
new file mode 100644
index 0000000..9c83bde
--- /dev/null
+++ b/app/resources/infobarbutton_b_n.png
diff --git a/app/resources/infobarbutton_b_p.png b/app/resources/infobarbutton_b_p.png
new file mode 100644
index 0000000..e8337a7
--- /dev/null
+++ b/app/resources/infobarbutton_b_p.png
diff --git a/app/resources/infobarbutton_bl_h.png b/app/resources/infobarbutton_bl_h.png
new file mode 100644
index 0000000..b621248
--- /dev/null
+++ b/app/resources/infobarbutton_bl_h.png
diff --git a/app/resources/infobarbutton_bl_n.png b/app/resources/infobarbutton_bl_n.png
new file mode 100644
index 0000000..b151024
--- /dev/null
+++ b/app/resources/infobarbutton_bl_n.png
diff --git a/app/resources/infobarbutton_bl_p.png b/app/resources/infobarbutton_bl_p.png
new file mode 100644
index 0000000..382bb94
--- /dev/null
+++ b/app/resources/infobarbutton_bl_p.png
diff --git a/app/resources/infobarbutton_br_h.png b/app/resources/infobarbutton_br_h.png
new file mode 100644
index 0000000..202e335
--- /dev/null
+++ b/app/resources/infobarbutton_br_h.png
diff --git a/app/resources/infobarbutton_br_n.png b/app/resources/infobarbutton_br_n.png
new file mode 100644
index 0000000..1b89dd6
--- /dev/null
+++ b/app/resources/infobarbutton_br_n.png
diff --git a/app/resources/infobarbutton_br_p.png b/app/resources/infobarbutton_br_p.png
new file mode 100644
index 0000000..e6eaf529
--- /dev/null
+++ b/app/resources/infobarbutton_br_p.png
diff --git a/app/resources/infobarbutton_c_h.png b/app/resources/infobarbutton_c_h.png
new file mode 100644
index 0000000..f43ea7f
--- /dev/null
+++ b/app/resources/infobarbutton_c_h.png
diff --git a/app/resources/infobarbutton_c_n.png b/app/resources/infobarbutton_c_n.png
new file mode 100644
index 0000000..17b9b6d
--- /dev/null
+++ b/app/resources/infobarbutton_c_n.png
diff --git a/app/resources/infobarbutton_c_p.png b/app/resources/infobarbutton_c_p.png
new file mode 100644
index 0000000..7e1a1fcf
--- /dev/null
+++ b/app/resources/infobarbutton_c_p.png
diff --git a/app/resources/infobarbutton_l_h.png b/app/resources/infobarbutton_l_h.png
new file mode 100644
index 0000000..b41b437
--- /dev/null
+++ b/app/resources/infobarbutton_l_h.png
diff --git a/app/resources/infobarbutton_l_n.png b/app/resources/infobarbutton_l_n.png
new file mode 100644
index 0000000..9209c58
--- /dev/null
+++ b/app/resources/infobarbutton_l_n.png
diff --git a/app/resources/infobarbutton_l_p.png b/app/resources/infobarbutton_l_p.png
new file mode 100644
index 0000000..efbd771
--- /dev/null
+++ b/app/resources/infobarbutton_l_p.png
diff --git a/app/resources/infobarbutton_menu_droparrow.png b/app/resources/infobarbutton_menu_droparrow.png
new file mode 100644
index 0000000..c9b183a
--- /dev/null
+++ b/app/resources/infobarbutton_menu_droparrow.png
diff --git a/app/resources/infobarbutton_r_h.png b/app/resources/infobarbutton_r_h.png
new file mode 100644
index 0000000..85634d7
--- /dev/null
+++ b/app/resources/infobarbutton_r_h.png
diff --git a/app/resources/infobarbutton_r_n.png b/app/resources/infobarbutton_r_n.png
new file mode 100644
index 0000000..03d6e18
--- /dev/null
+++ b/app/resources/infobarbutton_r_n.png
diff --git a/app/resources/infobarbutton_r_p.png b/app/resources/infobarbutton_r_p.png
new file mode 100644
index 0000000..75b7e56
--- /dev/null
+++ b/app/resources/infobarbutton_r_p.png
diff --git a/app/resources/infobarbutton_t_h.png b/app/resources/infobarbutton_t_h.png
new file mode 100644
index 0000000..1016c6d
--- /dev/null
+++ b/app/resources/infobarbutton_t_h.png
diff --git a/app/resources/infobarbutton_t_n.png b/app/resources/infobarbutton_t_n.png
new file mode 100644
index 0000000..268186b
--- /dev/null
+++ b/app/resources/infobarbutton_t_n.png
diff --git a/app/resources/infobarbutton_t_p.png b/app/resources/infobarbutton_t_p.png
new file mode 100644
index 0000000..bc91279
--- /dev/null
+++ b/app/resources/infobarbutton_t_p.png
diff --git a/app/resources/infobarbutton_tl_h.png b/app/resources/infobarbutton_tl_h.png
new file mode 100644
index 0000000..587b10c
--- /dev/null
+++ b/app/resources/infobarbutton_tl_h.png
diff --git a/app/resources/infobarbutton_tl_n.png b/app/resources/infobarbutton_tl_n.png
new file mode 100644
index 0000000..1a65a95
--- /dev/null
+++ b/app/resources/infobarbutton_tl_n.png
diff --git a/app/resources/infobarbutton_tl_p.png b/app/resources/infobarbutton_tl_p.png
new file mode 100644
index 0000000..374f3a0
--- /dev/null
+++ b/app/resources/infobarbutton_tl_p.png
diff --git a/app/resources/infobarbutton_tr_h.png b/app/resources/infobarbutton_tr_h.png
new file mode 100644
index 0000000..b6d88ed
--- /dev/null
+++ b/app/resources/infobarbutton_tr_h.png
diff --git a/app/resources/infobarbutton_tr_n.png b/app/resources/infobarbutton_tr_n.png
new file mode 100644
index 0000000..08598d3
--- /dev/null
+++ b/app/resources/infobarbutton_tr_n.png
diff --git a/app/resources/infobarbutton_tr_p.png b/app/resources/infobarbutton_tr_p.png
new file mode 100644
index 0000000..d4d6278
--- /dev/null
+++ b/app/resources/infobarbutton_tr_p.png
diff --git a/app/resources/input_alert.png b/app/resources/input_alert.png
new file mode 100644
index 0000000..503a545
--- /dev/null
+++ b/app/resources/input_alert.png