| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- This grd file contains images that are pre-scaled for device scale | 2 <!-- This grd file contains images that are pre-scaled for device scale |
| 3 factors. The image returned by |base::ResourceBundle::GetImageNamed| | 3 factors. The image returned by |base::ResourceBundle::GetImageNamed| |
| 4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The | 4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The |
| 5 |fallback_to_low_resolution| attribute controls behavior when | 5 |fallback_to_low_resolution| attribute controls behavior when |
| 6 an image file is missing for target scale factor. If true, chrome | 6 an image file is missing for target scale factor. If true, chrome |
| 7 will automatically scale the 1x image to the target scale factor. | 7 will automatically scale the 1x image to the target scale factor. |
| 8 If false, build will fail due to missing resources. This is | 8 If false, build will fail due to missing resources. This is |
| 9 currently set to true for all resources, but the default will | 9 currently set to true for all resources, but the default will |
| 10 become false in near future. | 10 become false in near future. |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 <if expr="is_win"> | 146 <if expr="is_win"> |
| 147 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file="
common/favicon_conflicts.png" /> | 147 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file="
common/favicon_conflicts.png" /> |
| 148 </if> | 148 </if> |
| 149 <!-- Ash doesn't draw rounded content area, so needs a special top | 149 <!-- Ash doesn't draw rounded content area, so needs a special top |
| 150 image. --> | 150 image. --> |
| 151 <if expr="not use_ash"> | 151 <if expr="not use_ash"> |
| 152 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file
="common/content_top_center.png" /> | 152 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file
="common/content_top_center.png" /> |
| 153 </if> | 153 </if> |
| 154 <if expr="use_ash"> | 154 <if expr="use_ash"> |
| 155 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file
="common/ash/content_top_center.png" /> | 155 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file
="common/ash/content_top_center.png" /> |
| 156 <if expr="is_win"> | 156 <if expr="not chromeos"> |
| 157 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_WIN
" file="common/content_top_center.png" /> | 157 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_DES
KTOP" file="common/content_top_center.png" /> |
| 158 </if> | 158 </if> |
| 159 </if> | 159 </if> |
| 160 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" f
ile="common/content_top_left_corner.png" /> | 160 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" f
ile="common/content_top_left_corner.png" /> |
| 161 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MA
SK" file="common/content_top_left_corner_mask.png" /> | 161 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MA
SK" file="common/content_top_left_corner_mask.png" /> |
| 162 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER"
file="common/content_top_right_corner.png" /> | 162 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER"
file="common/content_top_right_corner.png" /> |
| 163 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_M
ASK" file="common/content_top_right_corner_mask.png" /> | 163 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_M
ASK" file="common/content_top_right_corner_mask.png" /> |
| 164 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_EXTENSI
ON" file="common/controlled_setting_extension.png" /> | 164 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_EXTENSI
ON" file="common/controlled_setting_extension.png" /> |
| 165 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_MANDATO
RY" file="common/controlled_setting_mandatory.png" /> | 165 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_MANDATO
RY" file="common/controlled_setting_mandatory.png" /> |
| 166 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_OWNER"
file="common/controlled_setting_owner.png" /> | 166 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_OWNER"
file="common/controlled_setting_owner.png" /> |
| 167 <if expr="chromeos"> | 167 <if expr="chromeos"> |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 624 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_STAR_SELECTED" fil
e="common/omnibox_star_selected.png" /> | 624 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_STAR_SELECTED" fil
e="common/omnibox_star_selected.png" /> |
| 625 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS" file="common/
omnibox_tts.png" /> | 625 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS" file="common/
omnibox_tts.png" /> |
| 626 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_DARK" file="co
mmon/omnibox_tts_dark.png" /> | 626 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_DARK" file="co
mmon/omnibox_tts_dark.png" /> |
| 627 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_SELECTED" file
="common/omnibox_tts_selected.png" /> | 627 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_SELECTED" file
="common/omnibox_tts_selected.png" /> |
| 628 <if expr="toolkit_views"> | 628 <if expr="toolkit_views"> |
| 629 <if expr="not use_ash"> | 629 <if expr="not use_ash"> |
| 630 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common
/otr_icon.png" /> | 630 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common
/otr_icon.png" /> |
| 631 </if> | 631 </if> |
| 632 <if expr="use_ash"> | 632 <if expr="use_ash"> |
| 633 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common
/ash/otr_icon.png" /> | 633 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common
/ash/otr_icon.png" /> |
| 634 <if expr="is_win"> | 634 <if expr="not chromeos"> |
| 635 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_WIN" file="
common/otr_icon.png" /> | 635 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_DESKTOP" fi
le="common/otr_icon.png" /> |
| 636 </if> | 636 </if> |
| 637 </if> | 637 </if> |
| 638 </if> | 638 </if> |
| 639 <if expr="(is_macosx or is_ios) and not toolkit_views"> | 639 <if expr="(is_macosx or is_ios) and not toolkit_views"> |
| 640 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_
icon.png" /> | 640 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_
icon.png" /> |
| 641 </if> | 641 </if> |
| 642 <structure type="chrome_scaled_image" name="IDR_OVERLAY_DROP_SHADOW" file=
"common/overlay_drop_shadow.png" /> | 642 <structure type="chrome_scaled_image" name="IDR_OVERLAY_DROP_SHADOW" file=
"common/overlay_drop_shadow.png" /> |
| 643 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="common
/pageinfo_bad.png" /> | 643 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="common
/pageinfo_bad.png" /> |
| 644 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="commo
n/pageinfo_good.png" /> | 644 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="commo
n/pageinfo_good.png" /> |
| 645 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_INFO" file="commo
n/pageinfo_info.png" /> | 645 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_INFO" file="commo
n/pageinfo_info.png" /> |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1125 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi
le="theme_frame_inactive.png" /> | 1125 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi
le="theme_frame_inactive.png" /> |
| 1126 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f
ile="theme_frame_incognito.png" /> | 1126 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f
ile="theme_frame_incognito.png" /> |
| 1127 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN
ACTIVE" file="theme_frame_incognito_inactive.png" /> | 1127 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN
ACTIVE" file="theme_frame_incognito_inactive.png" /> |
| 1128 </if> | 1128 </if> |
| 1129 <if expr="use_ash"> | 1129 <if expr="use_ash"> |
| 1130 <!-- Ash has a gray frame, Windows uses blue. --> | 1130 <!-- Ash has a gray frame, Windows uses blue. --> |
| 1131 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="commo
n/ash/theme_frame_active.png" /> | 1131 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="commo
n/ash/theme_frame_active.png" /> |
| 1132 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi
le="common/ash/theme_frame_inactive.png" /> | 1132 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" fi
le="common/ash/theme_frame_inactive.png" /> |
| 1133 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f
ile="common/ash/theme_frame_incognito_active.png" /> | 1133 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" f
ile="common/ash/theme_frame_incognito_active.png" /> |
| 1134 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN
ACTIVE" file="common/ash/theme_frame_incognito_inactive.png" /> | 1134 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_IN
ACTIVE" file="common/ash/theme_frame_incognito_inactive.png" /> |
| 1135 <if expr="is_win"> | 1135 <if expr="not chromeos"> |
| 1136 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_WIN" file=
"theme_frame.png" /> | 1136 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_DESKTOP" f
ile="theme_frame.png" /> |
| 1137 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_W
IN" file="theme_frame_inactive.png" /> | 1137 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_D
ESKTOP" file="theme_frame_inactive.png" /> |
| 1138 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_
WIN" file="theme_frame_incognito.png" /> | 1138 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_
DESKTOP" file="theme_frame_incognito.png" /> |
| 1139 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_
INACTIVE_WIN" file="theme_frame_incognito_inactive.png" /> | 1139 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_
INACTIVE_DESKTOP" file="theme_frame_incognito_inactive.png" /> |
| 1140 </if> | 1140 </if> |
| 1141 </if> | 1141 </if> |
| 1142 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file=
"notused.png" /> | 1142 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file=
"notused.png" /> |
| 1143 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY_INACTI
VE" file="notused.png" /> | 1143 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY_INACTI
VE" file="notused.png" /> |
| 1144 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_ATTRIBUTION" fil
e="notused.png" /> | 1144 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_ATTRIBUTION" fil
e="notused.png" /> |
| 1145 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND" file
="common/ntp_background.png" /> | 1145 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND" file
="common/ntp_background.png" /> |
| 1146 <if expr="not use_ash and not is_macosx and not is_ios"> | 1146 <if expr="not use_ash and not is_macosx and not is_ios"> |
| 1147 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="theme_tab_background.png" /> | 1147 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="theme_tab_background.png" /> |
| 1148 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC
OGNITO" file="theme_tab_background_incognito.png" /> | 1148 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC
OGNITO" file="theme_tab_background_incognito.png" /> |
| 1149 </if> | 1149 </if> |
| 1150 <if expr="use_ash"> | 1150 <if expr="use_ash"> |
| 1151 <!-- Ash has gray tab backgrounds, Windows uses blue. --> | 1151 <!-- Ash has gray tab backgrounds, Windows uses blue. --> |
| 1152 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="common/ash/theme_default_inactive.png" /> | 1152 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="common/ash/theme_default_inactive.png" /> |
| 1153 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC
OGNITO" file="common/ash/theme_default_inactive.png" /> | 1153 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC
OGNITO" file="common/ash/theme_default_inactive.png" /> |
| 1154 <if expr="is_win"> | 1154 <if expr="not chromeos"> |
| 1155 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_W
IN" file="theme_tab_background.png" /> | 1155 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_D
ESKTOP" file="theme_tab_background.png" /> |
| 1156 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I
NCOGNITO_WIN" file="theme_tab_background_incognito.png" /> | 1156 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I
NCOGNITO_DESKTOP" file="theme_tab_background_incognito.png" /> |
| 1157 </if> | 1157 </if> |
| 1158 </if> | 1158 </if> |
| 1159 <if expr="is_macosx or is_ios"> | 1159 <if expr="is_macosx or is_ios"> |
| 1160 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="mac/theme_default_inactive.png" /> | 1160 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="mac/theme_default_inactive.png" /> |
| 1161 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INA
CTIVE" file="mac/theme_default_inactive_background.png" /> | 1161 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INA
CTIVE" file="mac/theme_default_inactive_background.png" /> |
| 1162 </if> | 1162 </if> |
| 1163 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" fi
le="theme_tab_background_glass.png" /> | 1163 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" fi
le="theme_tab_background_glass.png" /> |
| 1164 <if expr="not use_ash and not is_macosx and not is_ios"> | 1164 <if expr="not use_ash and not is_macosx and not is_ios"> |
| 1165 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the
me_toolbar_default.png" /> | 1165 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="the
me_toolbar_default.png" /> |
| 1166 </if> | 1166 </if> |
| 1167 <if expr="use_ash"> | 1167 <if expr="use_ash"> |
| 1168 <!-- Ash has a dark gray toolbar background, Windows has light gray. --> | 1168 <!-- Ash has a dark gray toolbar background, Windows has light gray. --> |
| 1169 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="com
mon/ash/theme_default_active.png" /> | 1169 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="com
mon/ash/theme_default_active.png" /> |
| 1170 <if expr="is_win"> | 1170 <if expr="not chromeos"> |
| 1171 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_WIN" fil
e="theme_toolbar_default.png" /> | 1171 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_DESKTOP"
file="theme_toolbar_default.png" /> |
| 1172 </if> | 1172 </if> |
| 1173 </if> | 1173 </if> |
| 1174 <if expr="is_macosx or is_ios"> | 1174 <if expr="is_macosx or is_ios"> |
| 1175 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="mac
/theme_default_active.png" /> | 1175 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="mac
/theme_default_active.png" /> |
| 1176 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE"
file="mac/theme_default_active_background.png" /> | 1176 <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE"
file="mac/theme_default_active_background.png" /> |
| 1177 </if> | 1177 </if> |
| 1178 <!-- Instant Extended API toolbar background is common for all platforms.
--> | 1178 <!-- Instant Extended API toolbar background is common for all platforms.
--> |
| 1179 <structure type="chrome_scaled_image" name="IDR_THEME_WINDOW_CONTROL_BACKG
ROUND" file="notused.png" /> | 1179 <structure type="chrome_scaled_image" name="IDR_THEME_WINDOW_CONTROL_BACKG
ROUND" file="notused.png" /> |
| 1180 <structure type="chrome_scaled_image" name="IDR_THROBBER_LIGHT" file="comm
on/throbber_light.png" /> | 1180 <structure type="chrome_scaled_image" name="IDR_THROBBER_LIGHT" file="comm
on/throbber_light.png" /> |
| 1181 <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file="co
mmon/throbber_waiting.png" /> | 1181 <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file="co
mmon/throbber_waiting.png" /> |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1244 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
" file="common/mail.png" /> | 1244 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
" file="common/mail.png" /> |
| 1245 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
_HOVER" file="common/mail_hover.png" /> | 1245 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
_HOVER" file="common/mail_hover.png" /> |
| 1246 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
_PRESSED" file="common/mail_pressed.png" /> | 1246 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
_PRESSED" file="common/mail_pressed.png" /> |
| 1247 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT"
file="common/chat.png" /> | 1247 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT"
file="common/chat.png" /> |
| 1248 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_
HOVER" file="common/chat_hover.png" /> | 1248 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_
HOVER" file="common/chat_hover.png" /> |
| 1249 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_
PRESSED" file="common/chat_pressed.png" /> | 1249 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_
PRESSED" file="common/chat_pressed.png" /> |
| 1250 | 1250 |
| 1251 </structures> | 1251 </structures> |
| 1252 </release> | 1252 </release> |
| 1253 </grit> | 1253 </grit> |
| OLD | NEW |