From dff6d13ca6ddb778867ce2d731d5f8093aef28ea Mon Sep 17 00:00:00 2001
From: "glen@chromium.org"
 <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 15 May 2009 22:40:57 +0000
Subject: Re-land of earlier NTP theme patch; now with mac and linux
 compatibility.

Review URL: http://codereview.chromium.org/115413

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16205 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/generated_resources.grd   |   4 ++++
 chrome/app/theme/ntp_background.png  | Bin 1885 -> 144 bytes
 chrome/app/theme/theme_resources.grd |   7 ++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'chrome/app')

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 33bbbf3..ffc5ab6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3814,6 +3814,10 @@ each locale. -->
         Don't ask again
       </message>
 
+      <message name="IDS_RGBA_CSS_FORMAT_STRING" translateable="false" desc="The format string to use when converting colors to CSS rgba().">
+        rgba($1, $2, $3, $4)
+      </message>
+
     </messages>
   </release>
 </grit>
diff --git a/chrome/app/theme/ntp_background.png b/chrome/app/theme/ntp_background.png
index fb75b9f..490e723 100644
Binary files a/chrome/app/theme/ntp_background.png and b/chrome/app/theme/ntp_background.png differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index c89f5db..b0080d5 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -175,6 +175,11 @@
       <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" />
+      <include name="IDR_NEWTAB_REMOVE_ICON" file="ntp_x_icon_small.png" type="BINDATA" />
+      <include name="IDR_NEWTAB_REMOVE_THUMBNAIL" file="ntp_x_icon.png" type="BINDATA" />
+      <include name="IDR_NEWTAB_REMOVE_THUMBNAIL_HOVER" file="ntp_x_icon_hover.png" type="BINDATA" />
+      <include name="IDR_NEWTAB_REMOVE_THUMBNAIL_ACTIVE" file="ntp_x_icon_active.png" type="BINDATA" />
+      <include name="IDR_NEWTAB_CLOSED_WINDOW" file="closed_window.png" type="BINDATA" />
       <include name="IDR_ARROW_RIGHT" file="arrow_right.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" />
       <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" />
@@ -304,7 +309,7 @@
       <include name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" type="BINDATA" />
       <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" />
-      <include name="IDR_THEME_NEWTAB_BACKGROUND" file="ntp_background.png" type="BINDATA" />
+      <include name="IDR_THEME_NTP_BACKGROUND" file="ntp_background.png" type="BINDATA" />
       
       <if expr="pp_ifdef('_google_chrome')">
         <include name="IDR_ABOUT_BACKGROUND" file="google_chrome/about_background.png" type="BINDATA" />
-- 
cgit v1.1