diff options
| author | adamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 03:01:11 +0000 |
|---|---|---|
| committer | adamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 03:01:11 +0000 |
| commit | a4dd82bf3b7ba38e1675eec6c70e0024471155f4 (patch) | |
| tree | 0a108dd760e99848289a23f3ceef6c12fdc7bab8 /webkit/glue | |
| parent | 8954f92f13d512f286390ba7ca625a1a2ca40cf6 (diff) | |
| download | chromium_src-a4dd82bf3b7ba38e1675eec6c70e0024471155f4.zip chromium_src-a4dd82bf3b7ba38e1675eec6c70e0024471155f4.tar.gz chromium_src-a4dd82bf3b7ba38e1675eec6c70e0024471155f4.tar.bz2 | |
Remove _NEW suffixes on Mac cursor images that have been moved from Blink
TBR=darin@chromium.org
BUG=303964
Review URL: https://codereview.chromium.org/28953006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/resources/webkit_resources.grd | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/webkit/glue/resources/webkit_resources.grd b/webkit/glue/resources/webkit_resources.grd index 6411421..1cfaa94 100644 --- a/webkit/glue/resources/webkit_resources.grd +++ b/webkit/glue/resources/webkit_resources.grd @@ -58,30 +58,29 @@ <if expr="is_macosx"> <structure type="chrome_scaled_image" name="IDR_OVERHANG_PATTERN" file="overhang_pattern.png" /> <structure type="chrome_scaled_image" name="IDR_OVERHANG_SHADOW" file="overhang_shadow.png" /> - <!-- TODO(adamk): Remove _NEW prefixes once dups of these resources are gone from blink_resources.grd --> - <structure type="chrome_scaled_image" name="IDR_ALIAS_CURSOR_NEW" file="alias_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_CELL_CURSOR_NEW" file="cell_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_EAST_RESIZE_CURSOR_NEW" file="east_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_EASTWEST_RESIZE_CURSOR_NEW" file="east_west_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_HELP_CURSOR_NEW" file="help_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_LINK_CURSOR_NEW" file="link_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_MOVE_CURSOR_NEW" file="move_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_NONE_CURSOR_NEW" file="none_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_NORTHEAST_RESIZE_CURSOR_NEW" file="north_east_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_NORTHEASTSOUTHWEST_RESIZE_CURSOR_NEW" file="north_east_south_west_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_NORTH_RESIZE_CURSOR_NEW" file="north_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_NORTHSOUTH_RESIZE_CURSOR_NEW" file="north_south_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_NORTHWEST_RESIZE_CURSOR_NEW" file="north_west_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_NORTHWESTSOUTHEAST_RESIZE_CURSOR_NEW" file="north_west_south_east_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_PROGRESS_CURSOR_NEW" file="progress_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_SOUTHEAST_RESIZE_CURSOR_NEW" file="south_east_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_SOUTH_RESIZE_CURSOR_NEW" file="south_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_SOUTHWEST_RESIZE_CURSOR_NEW" file="south_west_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_VERTICALTEXT_CURSOR_NEW" file="vertical_text_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_WAIT_CURSOR_NEW" file="wait_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_WEST_RESIZE_CURSOR_NEW" file="west_resize_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_ZOOMIN_CURSOR_NEW" file="zoom_in_cursor.png" /> - <structure type="chrome_scaled_image" name="IDR_ZOOMOUT_CURSOR_NEW" file="zoom_out_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_ALIAS_CURSOR" file="alias_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_CELL_CURSOR" file="cell_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_EAST_RESIZE_CURSOR" file="east_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_EASTWEST_RESIZE_CURSOR" file="east_west_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_HELP_CURSOR" file="help_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_LINK_CURSOR" file="link_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_MOVE_CURSOR" file="move_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_NONE_CURSOR" file="none_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_NORTHEAST_RESIZE_CURSOR" file="north_east_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_NORTHEASTSOUTHWEST_RESIZE_CURSOR" file="north_east_south_west_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_NORTH_RESIZE_CURSOR" file="north_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_NORTHSOUTH_RESIZE_CURSOR" file="north_south_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_NORTHWEST_RESIZE_CURSOR" file="north_west_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_NORTHWESTSOUTHEAST_RESIZE_CURSOR" file="north_west_south_east_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_PROGRESS_CURSOR" file="progress_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_SOUTHEAST_RESIZE_CURSOR" file="south_east_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_SOUTH_RESIZE_CURSOR" file="south_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_SOUTHWEST_RESIZE_CURSOR" file="south_west_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_VERTICALTEXT_CURSOR" file="vertical_text_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_WAIT_CURSOR" file="wait_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_WEST_RESIZE_CURSOR" file="west_resize_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_ZOOMIN_CURSOR" file="zoom_in_cursor.png" /> + <structure type="chrome_scaled_image" name="IDR_ZOOMOUT_CURSOR" file="zoom_out_cursor.png" /> </if> <structure type="chrome_scaled_image" name="IDR_PAN_SCROLL_ICON" file="pan_icon.png" /> <structure type="chrome_scaled_image" name="IDR_SEARCH_CANCEL" file="search_cancel.png" /> |