| 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE
_FILE" file="cros/choose_file.png" /> | 137 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE
_FILE" file="cros/choose_file.png" /> |
| 138 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P
HOTO" file="cros/take_photo.png" /> | 138 <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_P
HOTO" file="cros/take_photo.png" /> |
| 139 </if> | 139 </if> |
| 140 <if expr="toolkit_views or is_macosx or is_ios"> | 140 <if expr="toolkit_views or is_macosx or is_ios"> |
| 141 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="co
mmon/browser_action_normal.png" /> | 141 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="co
mmon/browser_action_normal.png" /> |
| 142 </if> | 142 </if> |
| 143 <if expr="is_macosx or is_ios"> | 143 <if expr="is_macosx or is_ios"> |
| 144 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file="
common/browser_action_hover.png" /> | 144 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file="
common/browser_action_hover.png" /> |
| 145 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file="
common/browser_action_pressed.png" /> | 145 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file="
common/browser_action_pressed.png" /> |
| 146 </if> | 146 </if> |
| 147 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW"
file="common/browser_actions_overflow_normal.png" /> | 147 <if expr="is_macosx"> |
| 148 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_H
" file="common/browser_actions_overflow_hover.png" /> | 148 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW
" file="mac/browser_actions_overflow_normal.png" /> |
| 149 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_P
" file="common/browser_actions_overflow_pressed.png" /> | 149 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW
_H" file="mac/browser_actions_overflow_hover.png" /> |
| 150 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW
_P" file="mac/browser_actions_overflow_pressed.png" /> |
| 151 </if> |
| 150 <if expr="chromeos"> | 152 <if expr="chromeos"> |
| 151 <structure type="chrome_scaled_image" name="IDR_BUILDINGS_ILLUSTRATION"
file="cros/buildings_illustration.png" /> | 153 <structure type="chrome_scaled_image" name="IDR_BUILDINGS_ILLUSTRATION"
file="cros/buildings_illustration.png" /> |
| 152 </if> | 154 </if> |
| 153 <structure type="chrome_scaled_image" name="IDR_CHEVRON_LEFT" file="common
/chevron_left.png" /> | 155 <structure type="chrome_scaled_image" name="IDR_CHEVRON_LEFT" file="common
/chevron_left.png" /> |
| 154 <structure type="chrome_scaled_image" name="IDR_CLOSE_BUTTON_MASK" file="c
ommon/close_button_mask.png" /> | 156 <structure type="chrome_scaled_image" name="IDR_CLOSE_BUTTON_MASK" file="c
ommon/close_button_mask.png" /> |
| 155 <if expr="is_win"> | 157 <if expr="is_win"> |
| 156 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file="
common/favicon_conflicts.png" /> | 158 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file="
common/favicon_conflicts.png" /> |
| 157 </if> | 159 </if> |
| 158 <if expr="chromeos"> | 160 <if expr="chromeos"> |
| 159 <structure type="chrome_scaled_image" name="IDR_CONSUMER_MANAGEMENT_NOTI
FICATION_ICON" file="cros/consumer_management_notification_icon.png" /> | 161 <structure type="chrome_scaled_image" name="IDR_CONSUMER_MANAGEMENT_NOTI
FICATION_ICON" file="cros/consumer_management_notification_icon.png" /> |
| (...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 937 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="
google_chrome/webstore_icon_32.png" /> | 939 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="
google_chrome/webstore_icon_32.png" /> |
| 938 </if> | 940 </if> |
| 939 <if expr="is_macosx"> | 941 <if expr="is_macosx"> |
| 940 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="legacy
/zoom_minus.png" /> | 942 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="legacy
/zoom_minus.png" /> |
| 941 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="legacy/
zoom_plus.png" /> | 943 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="legacy/
zoom_plus.png" /> |
| 942 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="legac
y/zoom_reset.png" /> | 944 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="legac
y/zoom_reset.png" /> |
| 943 </if> | 945 </if> |
| 944 </structures> | 946 </structures> |
| 945 </release> | 947 </release> |
| 946 </grit> | 948 </grit> |
| OLD | NEW |