| 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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 624 <if expr="not pp_ifdef('use_ash')"> | 624 <if expr="not pp_ifdef('use_ash')"> |
| 625 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common
/otr_icon.png" /> | 625 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common
/otr_icon.png" /> |
| 626 </if> | 626 </if> |
| 627 <if expr="pp_ifdef('use_ash')"> | 627 <if expr="pp_ifdef('use_ash')"> |
| 628 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="cros/o
tr_icon.png" /> | 628 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="cros/o
tr_icon.png" /> |
| 629 <if expr="is_win"> | 629 <if expr="is_win"> |
| 630 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_WIN" file="
common/otr_icon.png" /> | 630 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_WIN" file="
common/otr_icon.png" /> |
| 631 </if> | 631 </if> |
| 632 </if> | 632 </if> |
| 633 </if> | 633 </if> |
| 634 <if expr="is_macosx or is_ios"> | 634 <if expr="(is_macosx or is_ios) and not pp_ifdef('toolkit_views')"> |
| 635 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_
icon.png" /> | 635 <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_
icon.png" /> |
| 636 </if> | 636 </if> |
| 637 <if expr="context.startswith('default_')"> | 637 <if expr="context.startswith('default_')"> |
| 638 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil
e="common/otr_icon.png" /> | 638 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil
e="common/otr_icon.png" /> |
| 639 </if> | 639 </if> |
| 640 <if expr="not context.startswith('default_')"> | 640 <if expr="not context.startswith('default_')"> |
| 641 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil
e="otr_icon_fullscreen.png" /> | 641 <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" fil
e="otr_icon_fullscreen.png" /> |
| 642 </if> | 642 </if> |
| 643 <structure type="chrome_scaled_image" name="IDR_OVERLAY_DROP_SHADOW" file=
"common/overlay_drop_shadow.png" /> | 643 <structure type="chrome_scaled_image" name="IDR_OVERLAY_DROP_SHADOW" file=
"common/overlay_drop_shadow.png" /> |
| 644 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="pagein
fo_bad.png" /> | 644 <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="pagein
fo_bad.png" /> |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 937 <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios"> | 937 <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios"> |
| 938 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file=
"tab_active_center.png" /> | 938 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file=
"tab_active_center.png" /> |
| 939 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="t
ab_active_left.png" /> | 939 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="t
ab_active_left.png" /> |
| 940 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file="
tab_active_right.png" /> | 940 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file="
tab_active_right.png" /> |
| 941 </if> | 941 </if> |
| 942 <if expr="pp_ifdef('toolkit_views')"> | 942 <if expr="pp_ifdef('toolkit_views')"> |
| 943 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file=
"common/tab_active_center.png" /> | 943 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file=
"common/tab_active_center.png" /> |
| 944 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="c
ommon/tab_active_left.png" /> | 944 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="c
ommon/tab_active_left.png" /> |
| 945 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file="
common/tab_active_right.png" /> | 945 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file="
common/tab_active_right.png" /> |
| 946 </if> | 946 </if> |
| 947 <if expr="is_macosx or is_ios"> | 947 <if expr="(is_macosx or is_ios) and not pp_ifdef('toolkit_views')"> |
| 948 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file=
"mac/tab_active_center.png" /> | 948 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file=
"mac/tab_active_center.png" /> |
| 949 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="m
ac/tab_active_left.png" /> | 949 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="m
ac/tab_active_left.png" /> |
| 950 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file="
mac/tab_active_right.png" /> | 950 <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file="
mac/tab_active_right.png" /> |
| 951 <structure type="chrome_scaled_image" name="IDR_SWIPE_BACK" file="back_l
arge.png" /> | 951 <structure type="chrome_scaled_image" name="IDR_SWIPE_BACK" file="back_l
arge.png" /> |
| 952 <structure type="chrome_scaled_image" name="IDR_SWIPE_FORWARD" file="for
ward_large.png" /> | 952 <structure type="chrome_scaled_image" name="IDR_SWIPE_FORWARD" file="for
ward_large.png" /> |
| 953 <structure type="chrome_scaled_image" name="IDR_TABPOSE_CLOSE" file="mac
/tabpose_close.png" /> | 953 <structure type="chrome_scaled_image" name="IDR_TABPOSE_CLOSE" file="mac
/tabpose_close.png" /> |
| 954 </if> | 954 </if> |
| 955 <!-- Note: Tab close buttons are not traditional buttons. Tab close butto
ns | 955 <!-- Note: Tab close buttons are not traditional buttons. Tab close butto
ns |
| 956 fill a background with a color from the theme, tile IDR_CLOSE_1 over
it, | 956 fill a background with a color from the theme, tile IDR_CLOSE_1 over
it, |
| 957 then apply IDR_CLOSE_1_MASK. See chrome/browser/ui/views/tabs/tab.cc
--> | 957 then apply IDR_CLOSE_1_MASK. See chrome/browser/ui/views/tabs/tab.cc
--> |
| 958 <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios"> | 958 <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios"> |
| 959 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="ta
b_alpha_left.png" /> | 959 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="ta
b_alpha_left.png" /> |
| 960 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="t
ab_alpha_right.png" /> | 960 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="t
ab_alpha_right.png" /> |
| 961 </if> | 961 </if> |
| 962 <if expr="pp_ifdef('toolkit_views')"> | 962 <if expr="pp_ifdef('toolkit_views')"> |
| 963 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="co
mmon/tab_alpha_left.png" /> | 963 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="co
mmon/tab_alpha_left.png" /> |
| 964 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="c
ommon/tab_alpha_right.png" /> | 964 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="c
ommon/tab_alpha_right.png" /> |
| 965 </if> | 965 </if> |
| 966 <if expr="is_macosx or is_ios"> | 966 <if expr="(is_macosx or is_ios) and not pp_ifdef('toolkit_views')"> |
| 967 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="ma
c/tab_alpha_left.png" /> | 967 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="ma
c/tab_alpha_left.png" /> |
| 968 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="m
ac/tab_alpha_right.png" /> | 968 <structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="m
ac/tab_alpha_right.png" /> |
| 969 </if> | 969 </if> |
| 970 <structure type="chrome_scaled_image" name="IDR_CLOSE_1" file="common/clos
e_1.png" /> | 970 <structure type="chrome_scaled_image" name="IDR_CLOSE_1" file="common/clos
e_1.png" /> |
| 971 <structure type="chrome_scaled_image" name="IDR_CLOSE_1_H" file="common/cl
ose_1_hover.png" /> | 971 <structure type="chrome_scaled_image" name="IDR_CLOSE_1_H" file="common/cl
ose_1_hover.png" /> |
| 972 <structure type="chrome_scaled_image" name="IDR_CLOSE_1_MASK" file="common
/close_1_mask.png" /> | 972 <structure type="chrome_scaled_image" name="IDR_CLOSE_1_MASK" file="common
/close_1_mask.png" /> |
| 973 <structure type="chrome_scaled_image" name="IDR_CLOSE_1_P" file="common/cl
ose_1_pressed.png" /> | 973 <structure type="chrome_scaled_image" name="IDR_CLOSE_1_P" file="common/cl
ose_1_pressed.png" /> |
| 974 <structure type="chrome_scaled_image" name="IDR_TAB_AUDIO_INDICATOR" file=
"common/tab_audio_indicator.png" /> | 974 <structure type="chrome_scaled_image" name="IDR_TAB_AUDIO_INDICATOR" file=
"common/tab_audio_indicator.png" /> |
| 975 <structure type="chrome_scaled_image" name="IDR_TAB_CAPTURE_INDICATOR" fil
e="common/tab_capture_indicator.png" /> | 975 <structure type="chrome_scaled_image" name="IDR_TAB_CAPTURE_INDICATOR" fil
e="common/tab_capture_indicator.png" /> |
| 976 <structure type="chrome_scaled_image" name="IDR_TAB_DROP_DOWN" file="tab_d
rop_down.png" /> | 976 <structure type="chrome_scaled_image" name="IDR_TAB_DROP_DOWN" file="tab_d
rop_down.png" /> |
| 977 <structure type="chrome_scaled_image" name="IDR_TAB_DROP_UP" file="tab_dro
p_up.png" /> | 977 <structure type="chrome_scaled_image" name="IDR_TAB_DROP_UP" file="tab_dro
p_up.png" /> |
| 978 <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios"> | 978 <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios"> |
| 979 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" fil
e="tab_inactive_center.png" /> | 979 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" fil
e="tab_inactive_center.png" /> |
| 980 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file=
"tab_inactive_left.png" /> | 980 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file=
"tab_inactive_left.png" /> |
| 981 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file
="tab_inactive_right.png" /> | 981 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file
="tab_inactive_right.png" /> |
| 982 </if> | 982 </if> |
| 983 <if expr="pp_ifdef('toolkit_views')"> | 983 <if expr="pp_ifdef('toolkit_views')"> |
| 984 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" fil
e="common/tab_inactive_center.png" /> | 984 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" fil
e="common/tab_inactive_center.png" /> |
| 985 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file=
"common/tab_inactive_left.png" /> | 985 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file=
"common/tab_inactive_left.png" /> |
| 986 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file
="common/tab_inactive_right.png" /> | 986 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file
="common/tab_inactive_right.png" /> |
| 987 </if> | 987 </if> |
| 988 <if expr="is_macosx or is_ios"> | 988 <if expr="(is_macosx or is_ios) and not pp_ifdef('toolkit_views')"> |
| 989 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" fil
e="mac/tab_inactive_center.png" /> | 989 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" fil
e="mac/tab_inactive_center.png" /> |
| 990 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file=
"mac/tab_inactive_left.png" /> | 990 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file=
"mac/tab_inactive_left.png" /> |
| 991 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file
="mac/tab_inactive_right.png" /> | 991 <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file
="mac/tab_inactive_right.png" /> |
| 992 </if> | 992 </if> |
| 993 <structure type="chrome_scaled_image" name="IDR_TAB_RECORDING_INDICATOR" f
ile="common/tab_recording_indicator.png" /> | 993 <structure type="chrome_scaled_image" name="IDR_TAB_RECORDING_INDICATOR" f
ile="common/tab_recording_indicator.png" /> |
| 994 <structure type="chrome_scaled_image" name="IDR_TABLET_FAVICON" file="comm
on/favicon_tablet.png" /> | 994 <structure type="chrome_scaled_image" name="IDR_TABLET_FAVICON" file="comm
on/favicon_tablet.png" /> |
| 995 <if expr="pp_ifdef('chromeos')"> | 995 <if expr="pp_ifdef('chromeos')"> |
| 996 <structure type="chrome_scaled_image" name="IDR_TECHNICAL_ERROR" file="c
ros/technical_error.png" /> | 996 <structure type="chrome_scaled_image" name="IDR_TECHNICAL_ERROR" file="c
ros/technical_error.png" /> |
| 997 </if> | 997 </if> |
| 998 <if expr="not pp_ifdef('_google_chrome')"> | 998 <if expr="not pp_ifdef('_google_chrome')"> |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1152 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
" file="common/mail.png" /> | 1152 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
" file="common/mail.png" /> |
| 1153 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
_HOVER" file="common/mail_hover.png" /> | 1153 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
_HOVER" file="common/mail_hover.png" /> |
| 1154 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
_PRESSED" file="common/mail_pressed.png" /> | 1154 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL
_PRESSED" file="common/mail_pressed.png" /> |
| 1155 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT"
file="common/chat.png" /> | 1155 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT"
file="common/chat.png" /> |
| 1156 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_
HOVER" file="common/chat_hover.png" /> | 1156 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_
HOVER" file="common/chat_hover.png" /> |
| 1157 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_
PRESSED" file="common/chat_pressed.png" /> | 1157 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_
PRESSED" file="common/chat_pressed.png" /> |
| 1158 | 1158 |
| 1159 </structures> | 1159 </structures> |
| 1160 </release> | 1160 </release> |
| 1161 </grit> | 1161 </grit> |
| OLD | NEW |