| 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file="
common/browser_action_pressed.png" /> | 140 <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file="
common/browser_action_pressed.png" /> |
| 141 </if> | 141 </if> |
| 142 <if expr="chromeos"> | 142 <if expr="chromeos"> |
| 143 <structure type="chrome_scaled_image" name="IDR_BUILDINGS_ILLUSTRATION"
file="cros/buildings_illustration.png" /> | 143 <structure type="chrome_scaled_image" name="IDR_BUILDINGS_ILLUSTRATION"
file="cros/buildings_illustration.png" /> |
| 144 </if> | 144 </if> |
| 145 <structure type="chrome_scaled_image" name="IDR_CHEVRON_LEFT" file="common
/chevron_left.png" /> | 145 <structure type="chrome_scaled_image" name="IDR_CHEVRON_LEFT" file="common
/chevron_left.png" /> |
| 146 <structure type="chrome_scaled_image" name="IDR_CLOSE_BUTTON_MASK" file="c
ommon/close_button_mask.png" /> | 146 <structure type="chrome_scaled_image" name="IDR_CLOSE_BUTTON_MASK" file="c
ommon/close_button_mask.png" /> |
| 147 <if expr="is_win"> | 147 <if expr="is_win"> |
| 148 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file="
common/favicon_conflicts.png" /> | 148 <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file="
common/favicon_conflicts.png" /> |
| 149 </if> | 149 </if> |
| 150 <!-- Ash doesn't draw rounded content area, so needs a special top | |
| 151 image. --> | |
| 152 <if expr="not use_ash"> | |
| 153 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file
="common/content_top_center.png" /> | |
| 154 </if> | |
| 155 <if expr="use_ash"> | |
| 156 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file
="common/ash/content_top_center.png" /> | |
| 157 </if> | |
| 158 <if expr="not chromeos"> | |
| 159 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_DESKT
OP" file="common/content_top_center.png" /> | |
| 160 </if> | |
| 161 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" f
ile="common/content_top_left_corner.png" /> | |
| 162 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MA
SK" file="common/content_top_left_corner_mask.png" /> | |
| 163 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER"
file="common/content_top_right_corner.png" /> | |
| 164 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_M
ASK" file="common/content_top_right_corner_mask.png" /> | |
| 165 <structure type="chrome_scaled_image" name="IDR_COOKIE_ICON" file="common/
cookie.png" /> | 150 <structure type="chrome_scaled_image" name="IDR_COOKIE_ICON" file="common/
cookie.png" /> |
| 166 <structure type="chrome_scaled_image" name="IDR_COOKIE_STORAGE_ICON" file=
"common/cookie_storage.png" /> | 151 <structure type="chrome_scaled_image" name="IDR_COOKIE_STORAGE_ICON" file=
"common/cookie_storage.png" /> |
| 167 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_B
OTTOM_LEFT" file="common/developer_mode_highlight_bottom_left.png" /> | 152 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_B
OTTOM_LEFT" file="common/developer_mode_highlight_bottom_left.png" /> |
| 168 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_B
OTTOM" file="common/developer_mode_highlight_bottom.png" /> | 153 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_B
OTTOM" file="common/developer_mode_highlight_bottom.png" /> |
| 169 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_B
OTTOM_RIGHT" file="common/developer_mode_highlight_bottom_right.png" /> | 154 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_B
OTTOM_RIGHT" file="common/developer_mode_highlight_bottom_right.png" /> |
| 170 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_C
ENTER" file="common/developer_mode_highlight_center.png" /> | 155 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_C
ENTER" file="common/developer_mode_highlight_center.png" /> |
| 171 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_L
EFT" file="common/developer_mode_highlight_left.png" /> | 156 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_L
EFT" file="common/developer_mode_highlight_left.png" /> |
| 172 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_R
IGHT" file="common/developer_mode_highlight_right.png" /> | 157 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_R
IGHT" file="common/developer_mode_highlight_right.png" /> |
| 173 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_T
OP_LEFT" file="common/developer_mode_highlight_top_left.png" /> | 158 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_T
OP_LEFT" file="common/developer_mode_highlight_top_left.png" /> |
| 174 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_T
OP" file="common/developer_mode_highlight_top.png" /> | 159 <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_T
OP" file="common/developer_mode_highlight_top.png" /> |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 </if> | 227 </if> |
| 243 <structure type="chrome_scaled_image" name="IDR_FROZEN_TAB_ICON" file="com
mon/frozen_tab.png" /> | 228 <structure type="chrome_scaled_image" name="IDR_FROZEN_TAB_ICON" file="com
mon/frozen_tab.png" /> |
| 244 <structure type="chrome_scaled_image" name="IDR_FULLSCREEN_MENU_BUTTON" fi
le="common/fullscreen_menu_button.png" /> | 229 <structure type="chrome_scaled_image" name="IDR_FULLSCREEN_MENU_BUTTON" fi
le="common/fullscreen_menu_button.png" /> |
| 245 <if expr="is_macosx"> | 230 <if expr="is_macosx"> |
| 246 <structure type="chrome_scaled_image" name="IDR_GENERATE_PASSWORD_KEY" f
ile="legacy/password_generation_key.png" /> | 231 <structure type="chrome_scaled_image" name="IDR_GENERATE_PASSWORD_KEY" f
ile="legacy/password_generation_key.png" /> |
| 247 </if> | 232 </if> |
| 248 <if expr="_google_chrome"> | 233 <if expr="_google_chrome"> |
| 249 <structure type="chrome_scaled_image" name="IDR_GOOGLE_ICON" file="googl
e_chrome/google_icon.png" /> | 234 <structure type="chrome_scaled_image" name="IDR_GOOGLE_ICON" file="googl
e_chrome/google_icon.png" /> |
| 250 </if> | 235 </if> |
| 251 <structure type="chrome_scaled_image" name="IDR_HELP_MENU" file="common/he
lp_16.png" /> | 236 <structure type="chrome_scaled_image" name="IDR_HELP_MENU" file="common/he
lp_16.png" /> |
| 252 <if expr="toolkit_views or is_macosx or is_ios"> | 237 <if expr="is_macosx or is_ios"> |
| 253 <structure type="chrome_scaled_image" name="IDR_HOME" file="common/brows
er_home_normal.png" /> | 238 <structure type="chrome_scaled_image" name="IDR_HOME" file="common/brows
er_home_normal.png" /> |
| 254 </if> | |
| 255 <if expr="toolkit_views or is_macosx or is_ios"> | |
| 256 <structure type="chrome_scaled_image" name="IDR_HOME_H" file="common/bro
wser_home_hover.png" /> | 239 <structure type="chrome_scaled_image" name="IDR_HOME_H" file="common/bro
wser_home_hover.png" /> |
| 257 <structure type="chrome_scaled_image" name="IDR_HOME_P" file="common/bro
wser_home_pressed.png" /> | 240 <structure type="chrome_scaled_image" name="IDR_HOME_P" file="common/bro
wser_home_pressed.png" /> |
| 258 </if> | 241 </if> |
| 259 <structure type="chrome_scaled_image" name="IDR_HOTWORD_NOTIFICATION_ICON"
file="common/notification_hotword_icon.png" /> | 242 <structure type="chrome_scaled_image" name="IDR_HOTWORD_NOTIFICATION_ICON"
file="common/notification_hotword_icon.png" /> |
| 260 <if expr="not is_android and not is_ios"> | 243 <if expr="not is_android and not is_ios"> |
| 261 <!-- TODO(estade): replace with vector image when one's available. --> | 244 <!-- TODO(estade): replace with vector image when one's available. --> |
| 262 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_INCOG
NITO" file="common/incognito.png" /> | 245 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_INCOG
NITO" file="common/incognito.png" /> |
| 263 </if> | 246 </if> |
| 264 <if expr="is_macosx"> | 247 <if expr="is_macosx"> |
| 265 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_ACCOUNT_BU
TTON_ERROR" file="legacy/avatar_menu_auth_error.png" /> | 248 <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_ACCOUNT_BU
TTON_ERROR" file="legacy/avatar_menu_auth_error.png" /> |
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 852 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="
google_chrome/webstore_icon_32.png" /> | 835 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="
google_chrome/webstore_icon_32.png" /> |
| 853 </if> | 836 </if> |
| 854 <if expr="is_macosx"> | 837 <if expr="is_macosx"> |
| 855 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="legacy
/zoom_minus.png" /> | 838 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="legacy
/zoom_minus.png" /> |
| 856 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="legacy/
zoom_plus.png" /> | 839 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="legacy/
zoom_plus.png" /> |
| 857 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="legac
y/zoom_reset.png" /> | 840 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="legac
y/zoom_reset.png" /> |
| 858 </if> | 841 </if> |
| 859 </structures> | 842 </structures> |
| 860 </release> | 843 </release> |
| 861 </grit> | 844 </grit> |
| OLD | NEW |