summaryrefslogtreecommitdiffstats
path: root/chrome/app/theme
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 03:03:03 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 03:03:03 +0000
commit80453d922e568f08133f0d8495b73446471d8f82 (patch)
treee6c2d4756331fc323604248afe88bd134131b614 /chrome/app/theme
parent452416eba4c506da06d38af10354986debe1e756 (diff)
downloadchromium_src-80453d922e568f08133f0d8495b73446471d8f82.zip
chromium_src-80453d922e568f08133f0d8495b73446471d8f82.tar.gz
chromium_src-80453d922e568f08133f0d8495b73446471d8f82.tar.bz2
Recommit of r21474. Original description:
""" Make the tab close button color match the tab text. BUG=17378 TEST=Install themes with different tab text colors and verify that the tab close button changes color appropriately. Review URL: http://codereview.chromium.org/155882 """ Changes since then include removing a NOTREACHED and changing that method so that a caller can detect whether a ThemeProvider is available. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme')
-rw-r--r--chrome/app/theme/tab_close.pngbin257 -> 120 bytes
-rw-r--r--chrome/app/theme/tab_close_mask.pngbin0 -> 243 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd2
3 files changed, 2 insertions, 0 deletions
diff --git a/chrome/app/theme/tab_close.png b/chrome/app/theme/tab_close.png
index d02ec42..fe8695c 100644
--- a/chrome/app/theme/tab_close.png
+++ b/chrome/app/theme/tab_close.png
Binary files differ
diff --git a/chrome/app/theme/tab_close_mask.png b/chrome/app/theme/tab_close_mask.png
new file mode 100644
index 0000000..e7ad4c0
--- /dev/null
+++ b/chrome/app/theme/tab_close_mask.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 3e13670..6a742fe 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -57,6 +57,7 @@
<include name="IDR_TAB_CLOSE" file="tab_close.png" type="BINDATA" />
<include name="IDR_TAB_CLOSE_H" file="tab_close_h.png" type="BINDATA" />
<include name="IDR_TAB_CLOSE_P" file="tab_close_p.png" type="BINDATA" />
+ <include name="IDR_TAB_CLOSE_MASK" file="tab_close_mask.png" type="BINDATA" />
<include name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" type="BINDATA" />
<include name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" type="BINDATA" />
<include name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" type="BINDATA" />
@@ -285,6 +286,7 @@
<include name="IDR_THEME_TAB_BACKGROUND_V" file="theme_tab_background_glass.png" type="BINDATA" />
<include name="IDR_THEME_NTP_BACKGROUND" file="ntp_background.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_OVERLAY" file="notused.png" type="BINDATA" />
+ <include name="IDR_THEME_FRAME_OVERLAY_INACTIVE" file="notused.png" type="BINDATA" />
<include name="IDR_THEME_BUTTON_BACKGROUND" file="notused.png" type="BINDATA" />
<include name="IDR_THEME_NTP_ATTRIBUTION" file="notused.png" type="BINDATA" />
<include name="IDR_THEME_WINDOW_CONTROL_BACKGROUND" file="notused.png" type="BINDATA" />