From 4440f3922624f4389cdfe586b60d324ce5fcc014 Mon Sep 17 00:00:00 2001 From: "tbreisacher@chromium.org" Date: Fri, 15 Mar 2013 18:27:38 +0000 Subject: Revert 188259 "Move the webkit cursor resources to ui\resources\..." Broke Win performance_browser_tests build. > Move the webkit cursor resources to ui\resources\cursors as ui\aura needs to access them for > Chrome AURA. > > No major code changes here. Include path changes whereever necessary. > > BUG=176079 > TBR=brettw. > Review URL: https://codereview.chromium.org/12670004 TBR=ananta@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188438 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/test_shell/test_shell.gypi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'webkit/tools') diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 83955c0..a7162f1 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -6,15 +6,15 @@ 'variables': { 'test_shell_windows_resource_files': [ 'resources/test_shell.rc', - '../../../ui/resources/cursors/pan_east.cur', - '../../../ui/resources/cursors/pan_middle.cur', - '../../../ui/resources/cursors/pan_north.cur', - '../../../ui/resources/cursors/pan_north_east.cur', - '../../../ui/resources/cursors/pan_north_west.cur', - '../../../ui/resources/cursors/pan_south.cur', - '../../../ui/resources/cursors/pan_south_east.cur', - '../../../ui/resources/cursors/pan_south_west.cur', - '../../../ui/resources/cursors/pan_west.cur', + '../../glue/resources/pan_east.cur', + '../../glue/resources/pan_middle.cur', + '../../glue/resources/pan_north.cur', + '../../glue/resources/pan_north_east.cur', + '../../glue/resources/pan_north_west.cur', + '../../glue/resources/pan_south.cur', + '../../glue/resources/pan_south_east.cur', + '../../glue/resources/pan_south_west.cur', + '../../glue/resources/pan_west.cur', 'resources/small.ico', 'resources/test_shell.ico', 'resource.h', @@ -276,9 +276,9 @@ # but that causes errors in other targets when # resulting .res files get referenced multiple times. '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_unscaled_resources.rc', ], 'configurations': { 'Debug_Base': { -- cgit v1.1