diff options
author | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 18:54:45 +0000 |
---|---|---|
committer | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-15 18:54:45 +0000 |
commit | 97049b6b7fbe3506aaaada7ff52ab5bd0ddd73ed (patch) | |
tree | 147036703b003a7fa3c1e4f8997e80d819b1f454 /ui/resources | |
parent | 4440f3922624f4389cdfe586b60d324ce5fcc014 (diff) | |
download | chromium_src-97049b6b7fbe3506aaaada7ff52ab5bd0ddd73ed.zip chromium_src-97049b6b7fbe3506aaaada7ff52ab5bd0ddd73ed.tar.gz chromium_src-97049b6b7fbe3506aaaada7ff52ab5bd0ddd73ed.tar.bz2 |
Revert "Revert 188259 "Move the webkit cursor resources to ui\resources\...""
I shouldn't have rolled this back because there were follow-up fixes
that had already gone in:
crrev.com/188264
crrev.com/188392
TBR=sky@chromium.org, brettw@chromium.org
Review URL: https://codereview.chromium.org/12550014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188439 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
21 files changed, 35 insertions, 0 deletions
diff --git a/ui/resources/cursors/aliasb.cur b/ui/resources/cursors/aliasb.cur Binary files differnew file mode 100644 index 0000000..8d9ac94 --- /dev/null +++ b/ui/resources/cursors/aliasb.cur diff --git a/ui/resources/cursors/cell.cur b/ui/resources/cursors/cell.cur Binary files differnew file mode 100644 index 0000000..decfbdc --- /dev/null +++ b/ui/resources/cursors/cell.cur diff --git a/ui/resources/cursors/col_resize.cur b/ui/resources/cursors/col_resize.cur Binary files differnew file mode 100644 index 0000000..8f7f675 --- /dev/null +++ b/ui/resources/cursors/col_resize.cur diff --git a/ui/resources/cursors/copy.cur b/ui/resources/cursors/copy.cur Binary files differnew file mode 100644 index 0000000..87f1519c --- /dev/null +++ b/ui/resources/cursors/copy.cur diff --git a/ui/resources/cursors/hand_grab.cur b/ui/resources/cursors/hand_grab.cur Binary files differnew file mode 100644 index 0000000..4cdf428 --- /dev/null +++ b/ui/resources/cursors/hand_grab.cur diff --git a/ui/resources/cursors/hand_grabbing.cur b/ui/resources/cursors/hand_grabbing.cur Binary files differnew file mode 100644 index 0000000..0d95775 --- /dev/null +++ b/ui/resources/cursors/hand_grabbing.cur diff --git a/ui/resources/cursors/none.cur b/ui/resources/cursors/none.cur Binary files differnew file mode 100644 index 0000000..8fb6e5e --- /dev/null +++ b/ui/resources/cursors/none.cur diff --git a/ui/resources/cursors/pan_east.cur b/ui/resources/cursors/pan_east.cur Binary files differnew file mode 100644 index 0000000..f7c0df3 --- /dev/null +++ b/ui/resources/cursors/pan_east.cur diff --git a/ui/resources/cursors/pan_middle.cur b/ui/resources/cursors/pan_middle.cur Binary files differnew file mode 100644 index 0000000..52ae366 --- /dev/null +++ b/ui/resources/cursors/pan_middle.cur diff --git a/ui/resources/cursors/pan_north.cur b/ui/resources/cursors/pan_north.cur Binary files differnew file mode 100644 index 0000000..0c3a4ee --- /dev/null +++ b/ui/resources/cursors/pan_north.cur diff --git a/ui/resources/cursors/pan_north_east.cur b/ui/resources/cursors/pan_north_east.cur Binary files differnew file mode 100644 index 0000000..4388fb8 --- /dev/null +++ b/ui/resources/cursors/pan_north_east.cur diff --git a/ui/resources/cursors/pan_north_west.cur b/ui/resources/cursors/pan_north_west.cur Binary files differnew file mode 100644 index 0000000..d47089e --- /dev/null +++ b/ui/resources/cursors/pan_north_west.cur diff --git a/ui/resources/cursors/pan_south.cur b/ui/resources/cursors/pan_south.cur Binary files differnew file mode 100644 index 0000000..f5d813b --- /dev/null +++ b/ui/resources/cursors/pan_south.cur diff --git a/ui/resources/cursors/pan_south_east.cur b/ui/resources/cursors/pan_south_east.cur Binary files differnew file mode 100644 index 0000000..ba9742e --- /dev/null +++ b/ui/resources/cursors/pan_south_east.cur diff --git a/ui/resources/cursors/pan_south_west.cur b/ui/resources/cursors/pan_south_west.cur Binary files differnew file mode 100644 index 0000000..4f62984 --- /dev/null +++ b/ui/resources/cursors/pan_south_west.cur diff --git a/ui/resources/cursors/pan_west.cur b/ui/resources/cursors/pan_west.cur Binary files differnew file mode 100644 index 0000000..9068925 --- /dev/null +++ b/ui/resources/cursors/pan_west.cur diff --git a/ui/resources/cursors/row_resize.cur b/ui/resources/cursors/row_resize.cur Binary files differnew file mode 100644 index 0000000..a7369d3 --- /dev/null +++ b/ui/resources/cursors/row_resize.cur diff --git a/ui/resources/cursors/vertical_text.cur b/ui/resources/cursors/vertical_text.cur Binary files differnew file mode 100644 index 0000000..3de04eb --- /dev/null +++ b/ui/resources/cursors/vertical_text.cur diff --git a/ui/resources/cursors/zoom_in.cur b/ui/resources/cursors/zoom_in.cur Binary files differnew file mode 100644 index 0000000..b594d79 --- /dev/null +++ b/ui/resources/cursors/zoom_in.cur diff --git a/ui/resources/cursors/zoom_out.cur b/ui/resources/cursors/zoom_out.cur Binary files differnew file mode 100644 index 0000000..7e495fb --- /dev/null +++ b/ui/resources/cursors/zoom_out.cur diff --git a/ui/resources/ui_unscaled_resources.grd b/ui/resources/ui_unscaled_resources.grd new file mode 100644 index 0000000..46cae3b --- /dev/null +++ b/ui/resources/ui_unscaled_resources.grd @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" current_release="1"> + <outputs> + <output filename="grit/ui_unscaled_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="ui_unscaled_resources.rc" type="rc_all"/> + </outputs> + <release seq="1"> + <includes> + <if expr="is_win"> + <include name="IDC_ALIAS" file="cursors/aliasb.cur" type="CURSOR" /> + <include name="IDC_CELL" file="cursors/cell.cur" type="CURSOR" /> + <include name="IDC_COLRESIZE" file="cursors/col_resize.cur" type="CURSOR" /> + <include name="IDC_COPYCUR" file="cursors/copy.cur" type="CURSOR" /> + <include name="IDC_CURSOR_NONE" file="cursors/none.cur" type="CURSOR" /> + <include name="IDC_HAND_GRAB" file="cursors/hand_grab.cur" type="CURSOR" /> + <include name="IDC_HAND_GRABBING" file="cursors/hand_grabbing.cur" type="CURSOR" /> + <include name="IDC_PAN_EAST" file="cursors/pan_east.cur" type="CURSOR" /> + <include name="IDC_PAN_MIDDLE" file="cursors/pan_middle.cur" type="CURSOR" /> + <include name="IDC_PAN_NORTH" file="cursors/pan_north.cur" type="CURSOR" /> + <include name="IDC_PAN_NORTH_EAST" file="cursors/pan_north_east.cur" type="CURSOR" /> + <include name="IDC_PAN_NORTH_WEST" file="cursors/pan_north_west.cur" type="CURSOR" /> + <include name="IDC_PAN_SOUTH" file="cursors/pan_south.cur" type="CURSOR" /> + <include name="IDC_PAN_SOUTH_EAST" file="cursors/pan_south_east.cur" type="CURSOR" /> + <include name="IDC_PAN_SOUTH_WEST" file="cursors/pan_south_west.cur" type="CURSOR" /> + <include name="IDC_PAN_WEST" file="cursors/pan_west.cur" type="CURSOR" /> + <include name="IDC_ROWRESIZE" file="cursors/row_resize.cur" type="CURSOR" /> + <include name="IDC_VERTICALTEXT" file="cursors/vertical_text.cur" type="CURSOR" /> + <include name="IDC_ZOOMIN" file="cursors/zoom_in.cur" type="CURSOR" /> + <include name="IDC_ZOOMOUT" file="cursors/zoom_out.cur" type="CURSOR" /> + </if> + </includes> + </release> +</grit> |