Revert 119018 - Draw new tab button with tab background

Currently the new tab button is drawn with a semi-transparent image blended with the window background color.

This CL changes the drawing code so that we now use the inactive tab background image as the button's background. I've removed the fill from the newtab button images so that they just contain the border and shadow.

The main benefit of this approach is that the button now matches the look of inactive tabs.

Note, I'm only implementing this on views for now. Once this is implemented on all platforms we can remove the old button images.

Screenshots: http://imgur.com/a/iez8r

BUG=100775
TEST=
Review URL: https://chromiumcodereview.appspot.com/9252026

TBR=sail@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9288015

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

6 files changed, 6 insertions, 18 deletions

diff --git a/chrome/app/theme/large_newtab_p_views.png b/chrome/app/theme/large_newtab_p_views.png
deleted file mode 100644
index c812bd2..0000000
--- a/chrome/app/theme/large_newtab_p_views.png
+++ /dev/null
diff --git a/chrome/app/theme/large_newtab_views.png b/chrome/app/theme/large_newtab_views.png
deleted file mode 100644
index fa84f5b..0000000
--- a/chrome/app/theme/large_newtab_views.png
+++ /dev/null
diff --git a/chrome/app/theme/newtab_p_views.png b/chrome/app/theme/newtab_p_views.png
deleted file mode 100644
index 311be28..0000000
--- a/chrome/app/theme/newtab_p_views.png
+++ /dev/null
diff --git a/chrome/app/theme/newtab_views.png b/chrome/app/theme/newtab_views.png
deleted file mode 100644
index 3e18d43..0000000
--- a/chrome/app/theme/newtab_views.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_resources_large.grd b/chrome/app/theme/theme_resources_large.grd
index 7ebd2ee..3371bfb 100644
--- a/chrome/app/theme/theme_resources_large.grd
+++ b/chrome/app/theme/theme_resources_large.grd
@@ -87,16 +87,10 @@
       <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="large_keyword_search_bubble_c.png" type="BINDATA" />
       <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="large_keyword_search_bubble_l.png" type="BINDATA" />
       <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="large_keyword_search_bubble_r.png" type="BINDATA" />
-      <if expr="pp_ifdef('toolkit_views')">
-        <include name="IDR_NEWTAB_BUTTON" file="large_newtab_views.png" type="BINDATA" />
-        <include name="IDR_NEWTAB_BUTTON_P" file="large_newtab_p_views.png" type="BINDATA" />
-      </if>
-      <if expr="not pp_ifdef('toolkit_views')">
-        <include name="IDR_NEWTAB_BUTTON" file="large_newtab.png" type="BINDATA" />
-        <include name="IDR_NEWTAB_BUTTON_H" file="large_newtab_h.png" type="BINDATA" />
-        <include name="IDR_NEWTAB_BUTTON_P" file="large_newtab_p.png" type="BINDATA" />
-      </if>
+      <include name="IDR_NEWTAB_BUTTON" file="large_newtab.png" type="BINDATA" />
+      <include name="IDR_NEWTAB_BUTTON_H" file="large_newtab_h.png" type="BINDATA" />
       <include name="IDR_NEWTAB_BUTTON_MASK" file="large_newtab_button_mask.png" type="BINDATA" />
+      <include name="IDR_NEWTAB_BUTTON_P" file="large_newtab_p.png" type="BINDATA" />
       <include name="IDR_SETTINGS_FAVICON" file="large_settings_favicon.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="large_ev_bubble_c.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="large_ev_bubble_l.png" type="BINDATA" />
diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd
index 4d4df5d..ebd0cc6 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -90,16 +90,10 @@
       <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_C" file="keyword_search_bubble_c.png" type="BINDATA" />
       <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_L" file="keyword_search_bubble_l.png" type="BINDATA" />
       <include name="IDR_LOCATION_BAR_SELECTED_KEYWORD_BACKGROUND_R" file="keyword_search_bubble_r.png" type="BINDATA" />
-      <if expr="pp_ifdef('toolkit_views')">
-        <include name="IDR_NEWTAB_BUTTON" file="newtab_views.png" type="BINDATA" />
-        <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p_views.png" type="BINDATA" />
-      </if>
-      <if expr="not pp_ifdef('toolkit_views')">
-        <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" />
-        <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" />
-        <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" />
-      </if>
+      <include name="IDR_NEWTAB_BUTTON" file="newtab.png" type="BINDATA" />
+      <include name="IDR_NEWTAB_BUTTON_H" file="newtab_h.png" type="BINDATA" />
       <include name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" type="BINDATA" />
+      <include name="IDR_NEWTAB_BUTTON_P" file="newtab_p.png" type="BINDATA" />
       <include name="IDR_SETTINGS_FAVICON" file="settings_favicon.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_C" file="ev_bubble_c.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EV_BUBBLE_BACKGROUND_L" file="ev_bubble_l.png" type="BINDATA" />