| 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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 <structure type="chrome_scaled_image" name="IDR_HOME" file="common/brows
er_home_normal.png" /> | 341 <structure type="chrome_scaled_image" name="IDR_HOME" file="common/brows
er_home_normal.png" /> |
| 342 </if> | 342 </if> |
| 343 <if expr="not pp_ifdef('toolkit_views') and not is_macosx"> | 343 <if expr="not pp_ifdef('toolkit_views') and not is_macosx"> |
| 344 <structure type="chrome_scaled_image" name="IDR_HOME_H" file="home_hover
.png" /> | 344 <structure type="chrome_scaled_image" name="IDR_HOME_H" file="home_hover
.png" /> |
| 345 <structure type="chrome_scaled_image" name="IDR_HOME_P" file="home_press
ed.png" /> | 345 <structure type="chrome_scaled_image" name="IDR_HOME_P" file="home_press
ed.png" /> |
| 346 </if> | 346 </if> |
| 347 <if expr="pp_ifdef('toolkit_views') or is_macosx"> | 347 <if expr="pp_ifdef('toolkit_views') or is_macosx"> |
| 348 <structure type="chrome_scaled_image" name="IDR_HOME_H" file="common/bro
wser_home_hover.png" /> | 348 <structure type="chrome_scaled_image" name="IDR_HOME_H" file="common/bro
wser_home_hover.png" /> |
| 349 <structure type="chrome_scaled_image" name="IDR_HOME_P" file="common/bro
wser_home_pressed.png" /> | 349 <structure type="chrome_scaled_image" name="IDR_HOME_P" file="common/bro
wser_home_pressed.png" /> |
| 350 </if> | 350 </if> |
| 351 <if expr="pp_ifdef('chromeos')"> | 351 <if expr="not is_android and not pp_ifdef('ios')"> |
| 352 <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER24" file="i
con_add_user24.png" /> | 352 <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER24" file="i
con_add_user24.png" /> |
| 353 <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER_WHITE" fil
e="icon_add_user_white.png" /> | 353 <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER_WHITE" fil
e="icon_add_user_white.png" /> |
| 354 <structure type="chrome_scaled_image" name="IDR_ICON_GUEST_WHITE" file="
icon_guest_white.png" /> | 354 <structure type="chrome_scaled_image" name="IDR_ICON_GUEST_WHITE" file="
icon_guest_white.png" /> |
| 355 </if> |
| 356 <if expr="not is_android and not pp_ifdef('ios') and not pp_ifdef('chromeo
s')"> |
| 357 <!-- TODO(noms): Remove this once local profile avatars are migrated --> |
| 358 <structure type="chrome_scaled_image" name="IDR_USER_MANAGER_DEFAULT_AVA
TAR" file="avatar_user_color.png" /> |
| 359 </if> |
| 360 <if expr="pp_ifdef('chromeos')"> |
| 355 <structure type="chrome_scaled_image" name="IDR_ICON_POWER24" file="icon
_power24.png" /> | 361 <structure type="chrome_scaled_image" name="IDR_ICON_POWER24" file="icon
_power24.png" /> |
| 356 <structure type="chrome_scaled_image" name="IDR_ICON_POWER_WHITE" file="
icon_power_white.png" /> | 362 <structure type="chrome_scaled_image" name="IDR_ICON_POWER_WHITE" file="
icon_power_white.png" /> |
| 357 </if> | 363 </if> |
| 358 <if expr="is_win"> | 364 <if expr="is_win"> |
| 359 <structure type="chrome_scaled_image" name="IDR_INCOGNITO_SWITCH_OFF" fi
le="incognito_switch_off.png" /> | 365 <structure type="chrome_scaled_image" name="IDR_INCOGNITO_SWITCH_OFF" fi
le="incognito_switch_off.png" /> |
| 360 <structure type="chrome_scaled_image" name="IDR_INCOGNITO_SWITCH_ON" fil
e="incognito_switch_on.png" /> | 366 <structure type="chrome_scaled_image" name="IDR_INCOGNITO_SWITCH_ON" fil
e="incognito_switch_on.png" /> |
| 361 </if> | 367 </if> |
| 362 <structure type="chrome_scaled_image" name="IDR_INFO" file="info_small.png
" /> | 368 <structure type="chrome_scaled_image" name="IDR_INFO" file="info_small.png
" /> |
| 363 <if expr="pp_ifdef('toolkit_views')"> | 369 <if expr="pp_ifdef('toolkit_views')"> |
| 364 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT
OM" file="infobarbutton_bottom_hover.png" /> | 370 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT
OM" file="infobarbutton_bottom_hover.png" /> |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 979 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="
google_chrome/webstore_icon_16.png" /> | 985 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="
google_chrome/webstore_icon_16.png" /> |
| 980 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file="
google_chrome/webstore_icon_24.png" /> | 986 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file="
google_chrome/webstore_icon_24.png" /> |
| 981 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="
google_chrome/webstore_icon_32.png" /> | 987 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="
google_chrome/webstore_icon_32.png" /> |
| 982 </if> | 988 </if> |
| 983 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min
us.png" /> | 989 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min
us.png" /> |
| 984 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus
.png" /> | 990 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus
.png" /> |
| 985 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re
set.png" /> | 991 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re
set.png" /> |
| 986 </structures> | 992 </structures> |
| 987 </release> | 993 </release> |
| 988 </grit> | 994 </grit> |
| OLD | NEW |