Chromium Code Reviews| 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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 337 <structure type="chrome_scaled_image" name="IDR_HOME" file="common/brows er_home_normal.png" /> | 337 <structure type="chrome_scaled_image" name="IDR_HOME" file="common/brows er_home_normal.png" /> |
| 338 </if> | 338 </if> |
| 339 <if expr="not pp_ifdef('toolkit_views') and not is_macosx"> | 339 <if expr="not pp_ifdef('toolkit_views') and not is_macosx"> |
| 340 <structure type="chrome_scaled_image" name="IDR_HOME_H" file="home_hover .png" /> | 340 <structure type="chrome_scaled_image" name="IDR_HOME_H" file="home_hover .png" /> |
| 341 <structure type="chrome_scaled_image" name="IDR_HOME_P" file="home_press ed.png" /> | 341 <structure type="chrome_scaled_image" name="IDR_HOME_P" file="home_press ed.png" /> |
| 342 </if> | 342 </if> |
| 343 <if expr="pp_ifdef('toolkit_views') or is_macosx"> | 343 <if expr="pp_ifdef('toolkit_views') or is_macosx"> |
| 344 <structure type="chrome_scaled_image" name="IDR_HOME_H" file="common/bro wser_home_hover.png" /> | 344 <structure type="chrome_scaled_image" name="IDR_HOME_H" file="common/bro wser_home_hover.png" /> |
| 345 <structure type="chrome_scaled_image" name="IDR_HOME_P" file="common/bro wser_home_pressed.png" /> | 345 <structure type="chrome_scaled_image" name="IDR_HOME_P" file="common/bro wser_home_pressed.png" /> |
| 346 </if> | 346 </if> |
| 347 <if expr="pp_ifdef('chromeos')"> | 347 <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER24" file="ico n_add_user24.png" /> |
| 348 <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER24" file="i con_add_user24.png" /> | 348 <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER_WHITE" file= "icon_add_user_white.png" /> |
| 349 <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER_WHITE" fil e="icon_add_user_white.png" /> | 349 <structure type="chrome_scaled_image" name="IDR_ICON_GUEST_WHITE" file="ic on_guest_white.png" /> |
| 350 <structure type="chrome_scaled_image" name="IDR_ICON_GUEST_WHITE" file=" icon_guest_white.png" /> | 350 <structure type="chrome_scaled_image" name="IDR_ICON_POWER24" file="icon_p ower24.png" /> |
| 351 <structure type="chrome_scaled_image" name="IDR_ICON_POWER24" file="icon _power24.png" /> | 351 <structure type="chrome_scaled_image" name="IDR_ICON_POWER_WHITE" file="ic on_power_white.png" /> |
|
sail
2013/07/02 21:46:40
Did you intend to remove this from the ifdef?
noms
2013/07/03 17:11:34
I intended to remove some of them (to reuse them o
| |
| 352 <structure type="chrome_scaled_image" name="IDR_ICON_POWER_WHITE" file=" icon_power_white.png" /> | |
| 353 </if> | |
| 354 <if expr="is_win"> | 352 <if expr="is_win"> |
| 355 <structure type="chrome_scaled_image" name="IDR_INCOGNITO_SWITCH_OFF" fi le="incognito_switch_off.png" /> | 353 <structure type="chrome_scaled_image" name="IDR_INCOGNITO_SWITCH_OFF" fi le="incognito_switch_off.png" /> |
| 356 <structure type="chrome_scaled_image" name="IDR_INCOGNITO_SWITCH_ON" fil e="incognito_switch_on.png" /> | 354 <structure type="chrome_scaled_image" name="IDR_INCOGNITO_SWITCH_ON" fil e="incognito_switch_on.png" /> |
| 357 </if> | 355 </if> |
| 358 <structure type="chrome_scaled_image" name="IDR_INFO" file="info_small.png " /> | 356 <structure type="chrome_scaled_image" name="IDR_INFO" file="info_small.png " /> |
| 359 <if expr="pp_ifdef('toolkit_views')"> | 357 <if expr="pp_ifdef('toolkit_views')"> |
| 360 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM" file="infobarbutton_bottom_hover.png" /> | 358 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM" file="infobarbutton_bottom_hover.png" /> |
| 361 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM_LEFT" file="infobarbutton_bottom_left_hover.png" /> | 359 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM_LEFT" file="infobarbutton_bottom_left_hover.png" /> |
| 362 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM_RIGHT" file="infobarbutton_bottom_right_hover.png" /> | 360 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTT OM_RIGHT" file="infobarbutton_bottom_right_hover.png" /> |
| 363 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_CENT ER" file="infobarbutton_center_hover.png" /> | 361 <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_CENT ER" file="infobarbutton_center_hover.png" /> |
| (...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 965 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file=" google_chrome/webstore_icon_16.png" /> | 963 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file=" google_chrome/webstore_icon_16.png" /> |
| 966 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file=" google_chrome/webstore_icon_24.png" /> | 964 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file=" google_chrome/webstore_icon_24.png" /> |
| 967 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" /> | 965 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" /> |
| 968 </if> | 966 </if> |
| 969 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" /> | 967 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" /> |
| 970 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" /> | 968 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" /> |
| 971 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re set.png" /> | 969 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re set.png" /> |
| 972 </structures> | 970 </structures> |
| 973 </release> | 971 </release> |
| 974 </grit> | 972 </grit> |
| OLD | NEW |