Clean up app_resources.grd:

* Alphabetize a couple entries
* Move things to theme_resources.grd where possible; also fixes problems in chrome.gyp and theme_resources.grd that were causing "toolkit_views" to not be properly handled here, so this won't cause problems
* Scope things only used by views under an appropriate conditional

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

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

39 files changed, 64 insertions, 52 deletions

diff --git a/app/resources/app_resources.grd b/app/resources/app_resources.grd
index 3887a67..e45ac78 100644
--- a/app/resources/app_resources.grd
+++ b/app/resources/app_resources.grd
@@ -10,8 +10,6 @@
   <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" />
@@ -19,17 +17,11 @@
         <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" />
@@ -44,35 +36,6 @@
       <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" />
@@ -84,8 +47,6 @@
         <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" />
@@ -108,9 +69,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" />
@@ -120,9 +81,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" />
@@ -135,6 +96,17 @@
       <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/chrome/app/theme/infobarbutton_b_h.png
index dbca1b9..dbca1b9 100644
--- a/app/resources/infobarbutton_b_h.png
+++ b/chrome/app/theme/infobarbutton_b_h.png
diff --git a/app/resources/infobarbutton_b_n.png b/chrome/app/theme/infobarbutton_b_n.png
index 9c83bde..9c83bde 100644
--- a/app/resources/infobarbutton_b_n.png
+++ b/chrome/app/theme/infobarbutton_b_n.png
diff --git a/app/resources/infobarbutton_b_p.png b/chrome/app/theme/infobarbutton_b_p.png
index e8337a7..e8337a7 100644
--- a/app/resources/infobarbutton_b_p.png
+++ b/chrome/app/theme/infobarbutton_b_p.png
diff --git a/app/resources/infobarbutton_bl_h.png b/chrome/app/theme/infobarbutton_bl_h.png
index b621248..b621248 100644
--- a/app/resources/infobarbutton_bl_h.png
+++ b/chrome/app/theme/infobarbutton_bl_h.png
diff --git a/app/resources/infobarbutton_bl_n.png b/chrome/app/theme/infobarbutton_bl_n.png
index b151024..b151024 100644
--- a/app/resources/infobarbutton_bl_n.png
+++ b/chrome/app/theme/infobarbutton_bl_n.png
diff --git a/app/resources/infobarbutton_bl_p.png b/chrome/app/theme/infobarbutton_bl_p.png
index 382bb94..382bb94 100644
--- a/app/resources/infobarbutton_bl_p.png
+++ b/chrome/app/theme/infobarbutton_bl_p.png
diff --git a/app/resources/infobarbutton_br_h.png b/chrome/app/theme/infobarbutton_br_h.png
index 202e335..202e335 100644
--- a/app/resources/infobarbutton_br_h.png
+++ b/chrome/app/theme/infobarbutton_br_h.png
diff --git a/app/resources/infobarbutton_br_n.png b/chrome/app/theme/infobarbutton_br_n.png
index 1b89dd6..1b89dd6 100644
--- a/app/resources/infobarbutton_br_n.png
+++ b/chrome/app/theme/infobarbutton_br_n.png
diff --git a/app/resources/infobarbutton_br_p.png b/chrome/app/theme/infobarbutton_br_p.png
index e6eaf529..e6eaf529 100644
--- a/app/resources/infobarbutton_br_p.png
+++ b/chrome/app/theme/infobarbutton_br_p.png
diff --git a/app/resources/infobarbutton_c_h.png b/chrome/app/theme/infobarbutton_c_h.png
index f43ea7f..f43ea7f 100644
--- a/app/resources/infobarbutton_c_h.png
+++ b/chrome/app/theme/infobarbutton_c_h.png
diff --git a/app/resources/infobarbutton_c_n.png b/chrome/app/theme/infobarbutton_c_n.png
index 17b9b6d..17b9b6d 100644
--- a/app/resources/infobarbutton_c_n.png
+++ b/chrome/app/theme/infobarbutton_c_n.png
diff --git a/app/resources/infobarbutton_c_p.png b/chrome/app/theme/infobarbutton_c_p.png
index 7e1a1fcf..7e1a1fcf 100644
--- a/app/resources/infobarbutton_c_p.png
+++ b/chrome/app/theme/infobarbutton_c_p.png
diff --git a/app/resources/infobarbutton_l_h.png b/chrome/app/theme/infobarbutton_l_h.png
index b41b437..b41b437 100644
--- a/app/resources/infobarbutton_l_h.png
+++ b/chrome/app/theme/infobarbutton_l_h.png
diff --git a/app/resources/infobarbutton_l_n.png b/chrome/app/theme/infobarbutton_l_n.png
index 9209c58..9209c58 100644
--- a/app/resources/infobarbutton_l_n.png
+++ b/chrome/app/theme/infobarbutton_l_n.png
diff --git a/app/resources/infobarbutton_l_p.png b/chrome/app/theme/infobarbutton_l_p.png
index efbd771..efbd771 100644
--- a/app/resources/infobarbutton_l_p.png
+++ b/chrome/app/theme/infobarbutton_l_p.png
diff --git a/app/resources/infobarbutton_menu_droparrow.png b/chrome/app/theme/infobarbutton_menu_droparrow.png
index c9b183a..c9b183a 100644
--- a/app/resources/infobarbutton_menu_droparrow.png
+++ b/chrome/app/theme/infobarbutton_menu_droparrow.png
diff --git a/app/resources/infobarbutton_r_h.png b/chrome/app/theme/infobarbutton_r_h.png
index 85634d7..85634d7 100644
--- a/app/resources/infobarbutton_r_h.png
+++ b/chrome/app/theme/infobarbutton_r_h.png
diff --git a/app/resources/infobarbutton_r_n.png b/chrome/app/theme/infobarbutton_r_n.png
index 03d6e18..03d6e18 100644
--- a/app/resources/infobarbutton_r_n.png
+++ b/chrome/app/theme/infobarbutton_r_n.png
diff --git a/app/resources/infobarbutton_r_p.png b/chrome/app/theme/infobarbutton_r_p.png
index 75b7e56..75b7e56 100644
--- a/app/resources/infobarbutton_r_p.png
+++ b/chrome/app/theme/infobarbutton_r_p.png
diff --git a/app/resources/infobarbutton_t_h.png b/chrome/app/theme/infobarbutton_t_h.png
index 1016c6d..1016c6d 100644
--- a/app/resources/infobarbutton_t_h.png
+++ b/chrome/app/theme/infobarbutton_t_h.png
diff --git a/app/resources/infobarbutton_t_n.png b/chrome/app/theme/infobarbutton_t_n.png
index 268186b..268186b 100644
--- a/app/resources/infobarbutton_t_n.png
+++ b/chrome/app/theme/infobarbutton_t_n.png
diff --git a/app/resources/infobarbutton_t_p.png b/chrome/app/theme/infobarbutton_t_p.png
index bc91279..bc91279 100644
--- a/app/resources/infobarbutton_t_p.png
+++ b/chrome/app/theme/infobarbutton_t_p.png
diff --git a/app/resources/infobarbutton_tl_h.png b/chrome/app/theme/infobarbutton_tl_h.png
index 587b10c..587b10c 100644
--- a/app/resources/infobarbutton_tl_h.png
+++ b/chrome/app/theme/infobarbutton_tl_h.png
diff --git a/app/resources/infobarbutton_tl_n.png b/chrome/app/theme/infobarbutton_tl_n.png
index 1a65a95..1a65a95 100644
--- a/app/resources/infobarbutton_tl_n.png
+++ b/chrome/app/theme/infobarbutton_tl_n.png
diff --git a/app/resources/infobarbutton_tl_p.png b/chrome/app/theme/infobarbutton_tl_p.png
index 374f3a0..374f3a0 100644
--- a/app/resources/infobarbutton_tl_p.png
+++ b/chrome/app/theme/infobarbutton_tl_p.png
diff --git a/app/resources/infobarbutton_tr_h.png b/chrome/app/theme/infobarbutton_tr_h.png
index b6d88ed..b6d88ed 100644
--- a/app/resources/infobarbutton_tr_h.png
+++ b/chrome/app/theme/infobarbutton_tr_h.png
diff --git a/app/resources/infobarbutton_tr_n.png b/chrome/app/theme/infobarbutton_tr_n.png
index 08598d3..08598d3 100644
--- a/app/resources/infobarbutton_tr_n.png
+++ b/chrome/app/theme/infobarbutton_tr_n.png
diff --git a/app/resources/infobarbutton_tr_p.png b/chrome/app/theme/infobarbutton_tr_p.png
index d4d6278..d4d6278 100644
--- a/app/resources/infobarbutton_tr_p.png
+++ b/chrome/app/theme/infobarbutton_tr_p.png
diff --git a/app/resources/input_alert.png b/chrome/app/theme/input_alert.png
index 503a545..503a545 100644
--- a/app/resources/input_alert.png
+++ b/chrome/app/theme/input_alert.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index e1e690c..20b8924 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -198,6 +198,7 @@
         <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" />
@@ -380,13 +381,13 @@
       <include name="IDR_TAB_INACTIVE_NANO_RIGHT" file="tab_inactive_nano_right.png" type="BINDATA" />
       <include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" type="BINDATA" />
       <include name="IDR_THEME_BUTTON_BACKGROUND" file="notused.png" type="BINDATA" />
-      <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')">
+      <if expr="pp_ifdef('chromeos')">
         <include name="IDR_THEME_FRAME" file="theme_frame_default2.png" type="BINDATA" />
         <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive2.png" type="BINDATA" />
         <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito2.png" type="BINDATA" />
         <include name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_default_incognito_inactive2.png" type="BINDATA" />
       </if>
-      <if expr="not pp_ifdef('chromeos') and not pp_ifdef('toolkit_views')">
+      <if expr="not pp_ifdef('chromeos')">
         <include name="IDR_THEME_FRAME" file="theme_frame_default.png" type="BINDATA" />
         <include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive.png" type="BINDATA" />
         <include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito.png" type="BINDATA" />
@@ -396,18 +397,18 @@
       <include name="IDR_THEME_FRAME_OVERLAY_INACTIVE" file="notused.png" type="BINDATA" />
       <include name="IDR_THEME_NTP_ATTRIBUTION" file="notused.png" type="BINDATA" />
       <include name="IDR_THEME_NTP_BACKGROUND" file="ntp_background.png" type="BINDATA" />
-      <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')">
+      <if expr="pp_ifdef('chromeos')">
         <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background2.png" type="BINDATA" />
       </if>
-      <if expr="not pp_ifdef('chromeos') and not pp_ifdef('toolkit_views')">
+      <if expr="not pp_ifdef('chromeos')">
         <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
       </if>
       <include name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="theme_tab_background_incognito.png" type="BINDATA" />
       <include name="IDR_THEME_TAB_BACKGROUND_V" file="theme_tab_background_glass.png" type="BINDATA" />
-      <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')">
+      <if expr="pp_ifdef('chromeos')">
         <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default2.png" type="BINDATA" />
       </if>
-      <if expr="not pp_ifdef('chromeos') and not pp_ifdef('toolkit_views')">
+      <if expr="not pp_ifdef('chromeos')">
         <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type="BINDATA" />
       </if>
       <include name="IDR_THEME_WINDOW_CONTROL_BACKGROUND" file="notused.png" type="BINDATA" />
@@ -429,11 +430,43 @@
         <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>
 
-      <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')">
+      <if expr="pp_ifdef('chromeos')">
         <include name="IDR_COMPACTNAV_BACK" file="compactnav_back.png" type="BINDATA" />
         <include name="IDR_COMPACTNAV_FORWARD" file="compactnav_forward.png" type="BINDATA" />
         <include name="IDR_COMPACTNAV_SEPARATOR" file="compactnav_separator.png" type="BINDATA" />
@@ -524,7 +557,6 @@
         <include name="IDR_STATUSBAR_NETWORK_WIRED_PRESSED" file="statusbar_network_wired_pressed.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_WIRED" file="statusbar_wired.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_WIRED_BLACK" file="statusbar_wiredb.png" type="BINDATA" />
-        <include name="IDR_STATUSBAR_WIRED_BLACK" file="statusbar_wiredb.png" type="BINDATA" />
         <include name="IDR_USER_IMAGE_NO_VIDEO" file="login_other.png" type="BINDATA" />
         <include name="IDR_VOLUMEBUBBLE_ICON" file="volume_icon.png" type="BINDATA" />
       </if>
diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac.mm b/chrome/browser/autofill/autofill_dialog_controller_mac.mm
index 941eab9..b0feb24 100644
--- a/chrome/browser/autofill/autofill_dialog_controller_mac.mm
+++ b/chrome/browser/autofill/autofill_dialog_controller_mac.mm
@@ -21,6 +21,7 @@
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "grit/app_resources.h"
+#include "grit/theme_resources.h"
 
 // Delegate protocol that needs to be in place for the AutoFillTableView's
 // handling of delete and backspace keys.
diff --git a/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm b/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
index 7bd5219..dcb97ed 100644
--- a/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
+++ b/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -11,6 +11,7 @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
 namespace {
diff --git a/chrome/browser/gtk/options/content_exception_editor.cc b/chrome/browser/gtk/options/content_exception_editor.cc
index 002dfb3..10b786a 100644
--- a/chrome/browser/gtk/options/content_exception_editor.cc
+++ b/chrome/browser/gtk/options/content_exception_editor.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/host_content_settings_map.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 
 ContentExceptionEditor::ContentExceptionEditor(
     GtkWindow* parent,
diff --git a/chrome/browser/views/autofill_profiles_view_win.cc b/chrome/browser/views/autofill_profiles_view_win.cc
index fcc732ce..7900250 100644
--- a/chrome/browser/views/autofill_profiles_view_win.cc
+++ b/chrome/browser/views/autofill_profiles_view_win.cc
@@ -28,6 +28,7 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/locale_settings.h"
+#include "grit/theme_resources.h"
 #include "views/border.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/button/native_button.h"
diff --git a/chrome/browser/views/infobars/infobar_button_border.cc b/chrome/browser/views/infobars/infobar_button_border.cc
index c52a2bb..7a0ad9d 100644
--- a/chrome/browser/views/infobars/infobar_button_border.cc
+++ b/chrome/browser/views/infobars/infobar_button_border.cc
@@ -7,7 +7,7 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "gfx/canvas.h"
-#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
 #include "views/controls/button/text_button.h"
 
 // Preferred padding between text and edge
diff --git a/chrome/browser/views/infobars/translate_infobar_base.cc b/chrome/browser/views/infobars/translate_infobar_base.cc
index e80910b..1527c0b 100644
--- a/chrome/browser/views/infobars/translate_infobar_base.cc
+++ b/chrome/browser/views/infobars/translate_infobar_base.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/views/infobars/translate_message_infobar.h"
 #include "chrome/browser/views/infobars/infobar_button_border.h"
 #include "gfx/canvas_skia.h"
-#include "grit/app_resources.h"
+#include "grit/theme_resources.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/image_view.h"
 
diff --git a/chrome/browser/views/options/exception_editor_view.cc b/chrome/browser/views/options/exception_editor_view.cc
index 2bb8287..88e396b 100644
--- a/chrome/browser/views/options/exception_editor_view.cc
+++ b/chrome/browser/views/options/exception_editor_view.cc
@@ -12,6 +12,7 @@
 #include "googleurl/src/url_parse.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b6e961d..f8d27cb 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -345,6 +345,9 @@
             ['chromeos==1', {
               'action': ['-D', 'chromeos'],
             }],
+            ['toolkit_views==1', {
+              'action': ['-D', 'toolkit_views'],
+            }],
             ['use_titlecase_in_grd_files==1', {
               'action': ['-D', 'use_titlecase'],
             }],