Make new tab button color match inactive tab

chrome/app/theme/theme_resources_standard.grd

 <?xml version="1.0" encoding="UTF-8"?>
 <grit latest_public_release="0" current_release="1">
   <outputs>
     <output filename="grit/theme_resources_standard.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
     <output filename="grit/theme_resources_standard_map.cc" type="resource_map_source" />
     <output filename="grit/theme_resources_standard_map.h" type="resource_map_header" />
     <output filename="theme_resources_standard.pak" type="data_package" />
     <output filename="theme_resources_standard.rc" type="rc_all" />
@@ skipping 122 matching lines @@
         <include name="IDR_LOCATIONBG_C" file="default_100_percent/omnibox_c.png" type="BINDATA" />
         <include name="IDR_LOCATIONBG_L" file="default_100_percent/omnibox_l.png" type="BINDATA" />
         <include name="IDR_LOCATIONBG_R" file="default_100_percent/omnibox_r.png" type="BINDATA" />
         <include name="IDR_LOCATION_BAR_BORDER" file="default_100_percent/omnibox_border.png" type="BINDATA" />
       </if>
       <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="default_100_percent/keyword_search_bubble_c.png" type="BINDATA" />
       <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="default_100_percent/keyword_search_bubble_l.png" type="BINDATA" />
       <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="default_100_percent/keyword_search_bubble_r.png" type="BINDATA" />
       <include name="IDR_MOBILE" file="default_100_percent/mobile.png" type="BINDATA" />
       <include name="IDR_MOBILE_LIT" file="default_100_percent/mobile_lit.png" type="BINDATA" />
-      <if expr="pp_ifdef('toolkit_views')">
+      <if expr="pp_ifdef('use_ash')">
         <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/ash/newtab_normal.png" type="BINDATA" />
         <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/ash/newtab_hover.png" type="BINDATA" />
         <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/ash/newtab_pressed.png" type="BINDATA" />
         <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/ash/newtab_button_mask.png" type="BINDATA" />
       </if>
-      <if expr="not pp_ifdef('toolkit_views')">
+      <if expr="pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')">
+        <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/newtab_views.png" type="BINDATA" />
+        <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/newtab_hover.png" type="BINDATA" />
+        <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/newtab_p_views.png" type="BINDATA" />
+        <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/newtab_button_mask_views.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('toolkit_views') and not pp_ifdef('use_ash')">

[flackr, 2012/06/13 19:38:04]

This change broke running chrome with touch optimized UI. These changes should
be replicated in theme_resources_touch_1x.grd, theme_resources_touch_2x.grd and
theme_resources_2x.grd.

         <include name="IDR_NEWTAB_BUTTON" file="default_100_percent/newtab.png" type="BINDATA" />
         <include name="IDR_NEWTAB_BUTTON_H" file="default_100_percent/newtab_hover.png" type="BINDATA" />
         <include name="IDR_NEWTAB_BUTTON_P" file="default_100_percent/newtab_pressed.png" type="BINDATA" />
         <include name="IDR_NEWTAB_BUTTON_MASK" file="default_100_percent/newtab_button_mask.png" type="BINDATA" />
       </if>
       <include name="IDR_SETTINGS_FAVICON" file="default_100_percent/settings_favicon.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="default_100_percent/ev_bubble_c.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="default_100_percent/ev_bubble_l.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_R" file="default_100_percent/ev_bubble_r.png" type="BINDATA" />
       <include name="IDR_PLUGIN" file="default_100_percent/plugin.png" type="BINDATA" />
@@ skipping 106 matching lines @@
       <if expr="not pp_ifdef('toolkit_views')">
         <include name="IDR_TOOLS" file="default_100_percent/tools.png" type="BINDATA" />
         <include name="IDR_TOOLS_H" file="default_100_percent/tools_hover.png" type="BINDATA" />
         <include name="IDR_TOOLS_P" file="default_100_percent/tools_pressed.png" type="BINDATA" />
       </if>
       <include name="IDR_ZOOM_MINUS" file="default_100_percent/zoom_minus.png" type="BINDATA" />
       <include name="IDR_ZOOM_PLUS" file="default_100_percent/zoom_plus.png" type="BINDATA" />
     </includes>
   </release>
 </grit>