| 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 21 matching lines...) Expand all Loading... |
| 32 <structure type="chrome_scaled_image" name="IDR_ALLOWED_IMAGES" file="comm
on/allowed_images.png" /> | 32 <structure type="chrome_scaled_image" name="IDR_ALLOWED_IMAGES" file="comm
on/allowed_images.png" /> |
| 33 <structure type="chrome_scaled_image" name="IDR_ALLOWED_JAVASCRIPT" file="
common/allowed_script.png" /> | 33 <structure type="chrome_scaled_image" name="IDR_ALLOWED_JAVASCRIPT" file="
common/allowed_script.png" /> |
| 34 <structure type="chrome_scaled_image" name="IDR_ALLOWED_LOCATION" file="co
mmon/allowed_location.png" /> | 34 <structure type="chrome_scaled_image" name="IDR_ALLOWED_LOCATION" file="co
mmon/allowed_location.png" /> |
| 35 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MIC" file="common/
allowed_mic.png" /> | 35 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MIC" file="common/
allowed_mic.png" /> |
| 36 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MIDI_SYSEX" file="
common/allowed_midi.png" /> | 36 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MIDI_SYSEX" file="
common/allowed_midi.png" /> |
| 37 <structure type="chrome_scaled_image" name="IDR_ALLOWED_NOTIFICATION" file
="common/allowed_notifications.png" /> | 37 <structure type="chrome_scaled_image" name="IDR_ALLOWED_NOTIFICATION" file
="common/allowed_notifications.png" /> |
| 38 <if expr="enable_plugins"> | 38 <if expr="enable_plugins"> |
| 39 <structure type="chrome_scaled_image" name="IDR_ALLOWED_PLUGINS" file="c
ommon/allowed_plugins.png" /> | 39 <structure type="chrome_scaled_image" name="IDR_ALLOWED_PLUGINS" file="c
ommon/allowed_plugins.png" /> |
| 40 </if> | 40 </if> |
| 41 <structure type="chrome_scaled_image" name="IDR_ALLOWED_POPUPS" file="comm
on/allowed_popups.png" /> | 41 <structure type="chrome_scaled_image" name="IDR_ALLOWED_POPUPS" file="comm
on/allowed_popups.png" /> |
| 42 <structure type="chrome_scaled_image" name="IDR_ALLOWED_SUBRESOURCE_FILTER
" file="common/allowed_subresource_filter.png" /> |
| 42 <structure type="chrome_scaled_image" name="IDR_ALLOWED_USB" file="common/
allowed_usb.png" /> | 43 <structure type="chrome_scaled_image" name="IDR_ALLOWED_USB" file="common/
allowed_usb.png" /> |
| 43 <if expr="enable_app_list and _google_chrome"> | 44 <if expr="enable_app_list and _google_chrome"> |
| 44 <structure type="chrome_scaled_image" name="IDR_APP_LIST_GOOGLE_LOGO_VOI
CE_SEARCH" file="google_chrome/google_logo_voice_search.png" /> | 45 <structure type="chrome_scaled_image" name="IDR_APP_LIST_GOOGLE_LOGO_VOI
CE_SEARCH" file="google_chrome/google_logo_voice_search.png" /> |
| 45 </if> | 46 </if> |
| 46 <if expr="enable_app_list"> | 47 <if expr="enable_app_list"> |
| 47 <structure type="chrome_scaled_image" name="IDR_APP_LIST_TAB_OVERLAY" fi
le="common/app_list_v1_overlay.png" /> | 48 <structure type="chrome_scaled_image" name="IDR_APP_LIST_TAB_OVERLAY" fi
le="common/app_list_v1_overlay.png" /> |
| 48 <structure type="chrome_scaled_image" name="IDR_APP_LIST_MIC_HOTWORD_OFF
" file="common/app_list_mic_hotword_off.png" /> | 49 <structure type="chrome_scaled_image" name="IDR_APP_LIST_MIC_HOTWORD_OFF
" file="common/app_list_mic_hotword_off.png" /> |
| 49 <structure type="chrome_scaled_image" name="IDR_APP_LIST_MIC_HOTWORD_ON"
file="common/app_list_mic_hotword_on.png" /> | 50 <structure type="chrome_scaled_image" name="IDR_APP_LIST_MIC_HOTWORD_ON"
file="common/app_list_mic_hotword_on.png" /> |
| 50 </if> | 51 </if> |
| 51 <if expr="toolkit_views and not is_macosx"> | 52 <if expr="toolkit_views and not is_macosx"> |
| (...skipping 29 matching lines...) Expand all Loading... |
| 81 <structure type="chrome_scaled_image" name="IDR_BLOCKED_IMAGES" file="comm
on/blocked_images.png" /> | 82 <structure type="chrome_scaled_image" name="IDR_BLOCKED_IMAGES" file="comm
on/blocked_images.png" /> |
| 82 <structure type="chrome_scaled_image" name="IDR_BLOCKED_JAVASCRIPT" file="
common/blocked_script.png" /> | 83 <structure type="chrome_scaled_image" name="IDR_BLOCKED_JAVASCRIPT" file="
common/blocked_script.png" /> |
| 83 <structure type="chrome_scaled_image" name="IDR_BLOCKED_LOCATION" file="co
mmon/blocked_location.png" /> | 84 <structure type="chrome_scaled_image" name="IDR_BLOCKED_LOCATION" file="co
mmon/blocked_location.png" /> |
| 84 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIC" file="common/
blocked_mic.png" /> | 85 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIC" file="common/
blocked_mic.png" /> |
| 85 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIDI_SYSEX" file="
common/blocked_midi.png" /> | 86 <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIDI_SYSEX" file="
common/blocked_midi.png" /> |
| 86 <structure type="chrome_scaled_image" name="IDR_BLOCKED_NOTIFICATION" file
="common/blocked_notifications.png" /> | 87 <structure type="chrome_scaled_image" name="IDR_BLOCKED_NOTIFICATION" file
="common/blocked_notifications.png" /> |
| 87 <if expr="enable_plugins"> | 88 <if expr="enable_plugins"> |
| 88 <structure type="chrome_scaled_image" name="IDR_BLOCKED_PLUGINS" file="c
ommon/blocked_plugins.png" /> | 89 <structure type="chrome_scaled_image" name="IDR_BLOCKED_PLUGINS" file="c
ommon/blocked_plugins.png" /> |
| 89 </if> | 90 </if> |
| 90 <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="comm
on/blocked_popups.png" /> | 91 <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="comm
on/blocked_popups.png" /> |
| 92 <structure type="chrome_scaled_image" name="IDR_BLOCKED_SUBRESOURCE_FILTER
" file="common/blocked_subresource_filter.png" /> |
| 91 <structure type="chrome_scaled_image" name="IDR_BLOCKED_USB" file="common/
blocked_usb.png" /> | 93 <structure type="chrome_scaled_image" name="IDR_BLOCKED_USB" file="common/
blocked_usb.png" /> |
| 92 <if expr="chromeos"> | 94 <if expr="chromeos"> |
| 93 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_KEYBOARD" file
="cros/bluetooth_pairing_keyboard.png" /> | 95 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_KEYBOARD" file
="cros/bluetooth_pairing_keyboard.png" /> |
| 94 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_MOUSE" file="c
ros/bluetooth_pairing_mouse.png" /> | 96 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_MOUSE" file="c
ros/bluetooth_pairing_mouse.png" /> |
| 95 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK"
file="cros/bluetooth_pairing_tick.png" /> | 97 <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK"
file="cros/bluetooth_pairing_tick.png" /> |
| 96 </if> | 98 </if> |
| 97 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c
ommon/favicon_bookmarks.png" /> | 99 <structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="c
ommon/favicon_bookmarks.png" /> |
| 98 <if expr="is_macosx or is_ios"> | 100 <if expr="is_macosx or is_ios"> |
| 99 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil
e="mac/bookmark_bar_folder.png" /> | 101 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" fil
e="mac/bookmark_bar_folder.png" /> |
| 100 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA
GED" file="mac/bookmark_bar_folder_managed.png" /> | 102 <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANA
GED" file="mac/bookmark_bar_folder_managed.png" /> |
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 </if> | 538 </if> |
| 537 <if expr="_google_chrome"> | 539 <if expr="_google_chrome"> |
| 538 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON" file="goo
gle_chrome/webstore_icon.png" /> | 540 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON" file="goo
gle_chrome/webstore_icon.png" /> |
| 539 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="
google_chrome/webstore_icon_16.png" /> | 541 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="
google_chrome/webstore_icon_16.png" /> |
| 540 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file="
google_chrome/webstore_icon_24.png" /> | 542 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file="
google_chrome/webstore_icon_24.png" /> |
| 541 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="
google_chrome/webstore_icon_32.png" /> | 543 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="
google_chrome/webstore_icon_32.png" /> |
| 542 </if> | 544 </if> |
| 543 </structures> | 545 </structures> |
| 544 </release> | 546 </release> |
| 545 </grit> | 547 </grit> |
| OLD | NEW |