Index: chrome/app/theme/theme_resources.grd |
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd |
index 868e023a01f231013dac6c0dac364cb5536b4c08..560cbd189c0c297e5f4b02836ce1e307b90d4acc 100644 |
--- a/chrome/app/theme/theme_resources.grd |
+++ b/chrome/app/theme/theme_resources.grd |
@@ -588,31 +588,19 @@ |
<structure type="chrome_scaled_image" name="IDR_TEXTFIELD_TOP_LEFT" file="common/textfield_top_left.png" /> |
<structure type="chrome_scaled_image" name="IDR_TEXTFIELD_TOP_RIGHT" file="common/textfield_top_right.png" /> |
</if> |
+ <!-- These IDR_ defines that link to notused.png are relevant to custom browser themes but are not used by the classic/default theme. --> |
<structure type="chrome_scaled_image" name="IDR_THEME_BUTTON_BACKGROUND" file="notused.png" /> |
- <if expr="not use_ash"> |
- <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="theme_frame.png" /> |
- <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_inactive.png" /> |
- <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_incognito.png" /> |
- <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_incognito_inactive.png" /> |
- </if> |
- <if expr="use_ash"> |
- <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="notused.png" /> |
- <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="notused.png" /> |
- <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" file="notused.png" /> |
- <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="notused.png" /> |
- </if> |
+ <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="notused.png" /> |
+ <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="notused.png" /> |
+ <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" file="notused.png" /> |
+ <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="notused.png" /> |
<structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file="notused.png" /> |
<structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY_INACTIVE" file="notused.png" /> |
<structure type="chrome_scaled_image" name="IDR_THEME_NTP_ATTRIBUTION" file="notused.png" /> |
- <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND" file="common/ntp_background.png" /> |
- <if expr="not use_ash and not is_macosx and not is_ios"> |
- <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" /> |
- <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="theme_tab_background_incognito.png" /> |
- </if> |
- <if expr="use_ash"> |
- <!-- Ash has gray tab backgrounds, Windows uses blue. --> |
- <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="common/ash/theme_default_inactive.png" /> |
- <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="common/ash/theme_default_inactive.png" /> |
+ <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND" file="notused.png" /> |
+ <if expr="not is_macosx and not is_ios"> |
+ <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="notused.png" /> |
+ <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="notused.png" /> |
</if> |
<if expr="is_macosx or is_ios"> |
<structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="mac/theme_default_inactive.png" /> |
@@ -621,7 +609,7 @@ |
<structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="mac/theme_default_inactive.png" /> |
</if> |
</if> |
- <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" file="theme_tab_background_glass.png" /> |
+ <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" file="notused.png" /> |
<if expr="not is_macosx and not is_ios"> |
<!-- This identifier exists to give us something to associate with a custom image that a theme can provide. |
In normal themes, it's unused. --> |