| 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 853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_W
IN" file="theme_frame_inactive.png" /> | 864 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_W
IN" file="theme_frame_inactive.png" /> |
| 865 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_
WIN" file="theme_frame_incognito.png" /> | 865 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_
WIN" file="theme_frame_incognito.png" /> |
| 866 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_
INACTIVE_WIN" file="theme_frame_incognito_inactive.png" /> | 866 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_
INACTIVE_WIN" file="theme_frame_incognito_inactive.png" /> |
| 867 </if> | 867 </if> |
| 868 </if> | 868 </if> |
| 869 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file=
"notused.png" /> | 869 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file=
"notused.png" /> |
| 870 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY_INACTI
VE" file="notused.png" /> | 870 <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY_INACTI
VE" file="notused.png" /> |
| 871 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_ATTRIBUTION" fil
e="notused.png" /> | 871 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_ATTRIBUTION" fil
e="notused.png" /> |
| 872 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND" file
="common/ntp_background.png" /> | 872 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND" file
="common/ntp_background.png" /> |
| 873 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND_WHITE
" file="common/ntp_background_white.png" /> | 873 <structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND_WHITE
" file="common/ntp_background_white.png" /> |
| 874 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_OVERL
AY" file="notused.png" /> |
| 875 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOG
NITO_OVERLAY" file="notused.png" /> |
| 876 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V_OVE
RLAY" file="notused.png" /> |
| 874 <if expr="not pp_ifdef('use_ash') and not is_macosx and not is_ios"> | 877 <if expr="not pp_ifdef('use_ash') and not is_macosx and not is_ios"> |
| 875 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="theme_tab_background.png" /> | 878 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="theme_tab_background.png" /> |
| 876 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC
OGNITO" file="theme_tab_background_incognito.png" /> | 879 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC
OGNITO" file="theme_tab_background_incognito.png" /> |
| 877 </if> | 880 </if> |
| 878 <if expr="pp_ifdef('use_ash')"> | 881 <if expr="pp_ifdef('use_ash')"> |
| 879 <!-- Ash has gray tab backgrounds, Windows uses blue. --> | 882 <!-- Ash has gray tab backgrounds, Windows uses blue. --> |
| 880 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="cros/theme_default_inactive.png" /> | 883 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="cros/theme_default_inactive.png" /> |
| 881 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC
OGNITO" file="cros/theme_default_inactive.png" /> | 884 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INC
OGNITO" file="cros/theme_default_inactive.png" /> |
| 882 <if expr="is_win"> | 885 <if expr="is_win"> |
| 886 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_O
VERLAY_WIN" file="notused.png" /> |
| 887 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I
NCOGNITO_OVERLAY_WIN" file="notused.png" /> |
| 883 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_W
IN" file="theme_tab_background.png" /> | 888 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_W
IN" file="theme_tab_background.png" /> |
| 884 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I
NCOGNITO_WIN" file="theme_tab_background_incognito.png" /> | 889 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_I
NCOGNITO_WIN" file="theme_tab_background_incognito.png" /> |
| 885 </if> | 890 </if> |
| 886 </if> | 891 </if> |
| 887 <if expr="is_macosx or is_ios"> | 892 <if expr="is_macosx or is_ios"> |
| 888 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="mac/theme_default_inactive.png" /> | 893 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" fi
le="mac/theme_default_inactive.png" /> |
| 889 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INA
CTIVE" file="mac/theme_default_inactive_background.png" /> | 894 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INA
CTIVE" file="mac/theme_default_inactive_background.png" /> |
| 890 </if> | 895 </if> |
| 891 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" fi
le="theme_tab_background_glass.png" /> | 896 <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" fi
le="theme_tab_background_glass.png" /> |
| 892 <if expr="not pp_ifdef('use_ash') and not is_macosx and not is_ios"> | 897 <if expr="not pp_ifdef('use_ash') and not is_macosx and not is_ios"> |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 991 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="
google_chrome/webstore_icon_16.png" /> | 996 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="
google_chrome/webstore_icon_16.png" /> |
| 992 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file="
google_chrome/webstore_icon_24.png" /> | 997 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file="
google_chrome/webstore_icon_24.png" /> |
| 993 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="
google_chrome/webstore_icon_32.png" /> | 998 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="
google_chrome/webstore_icon_32.png" /> |
| 994 </if> | 999 </if> |
| 995 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min
us.png" /> | 1000 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min
us.png" /> |
| 996 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus
.png" /> | 1001 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus
.png" /> |
| 997 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re
set.png" /> | 1002 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re
set.png" /> |
| 998 </structures> | 1003 </structures> |
| 999 </release> | 1004 </release> |
| 1000 </grit> | 1005 </grit> |
| OLD | NEW |