30 files changed, 53 insertions, 80 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 8f5aab4..085dda9 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -116,15 +116,15 @@
                 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
                 '../base/win/dllmain.cc',
 
-                '../ui/resources/cursors/aliasb.cur',
-                '../ui/resources/cursors/cell.cur',
-                '../ui/resources/cursors/col_resize.cur',
-                '../ui/resources/cursors/copy.cur',
-                '../ui/resources/cursors/none.cur',
-                '../ui/resources/cursors/row_resize.cur',
-                '../ui/resources/cursors/vertical_text.cur',
-                '../ui/resources/cursors/zoom_in.cur',
-                '../ui/resources/cursors/zoom_out.cur',
+                '../webkit/glue/resources/aliasb.cur',
+                '../webkit/glue/resources/cell.cur',
+                '../webkit/glue/resources/col_resize.cur',
+                '../webkit/glue/resources/copy.cur',
+                '../webkit/glue/resources/none.cur',
+                '../webkit/glue/resources/row_resize.cur',
+                '../webkit/glue/resources/vertical_text.cur',
+                '../webkit/glue/resources/zoom_in.cur',
+                '../webkit/glue/resources/zoom_out.cur',
 
                 # TODO:  It would be nice to have these pulled in
                 # automatically from direct_dependent_settings in
@@ -137,8 +137,8 @@
                 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
                 '<(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_unscaled_resources.rc',
               ],
               'include_dirs': [
                 '<(DEPTH)/third_party/wtl/include',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 52a77ef..e121921 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -396,15 +396,15 @@
             '../ui/ui.gyp:ui_resources',
           ],
           'sources': [
-            '../ui/resources/cursors/aliasb.cur',
-            '../ui/resources/cursors/cell.cur',
-            '../ui/resources/cursors/col_resize.cur',
-            '../ui/resources/cursors/copy.cur',
-            '../ui/resources/cursors/none.cur',
-            '../ui/resources/cursors/row_resize.cur',
-            '../ui/resources/cursors/vertical_text.cur',
-            '../ui/resources/cursors/zoom_in.cur',
-            '../ui/resources/cursors/zoom_out.cur',
+            '../webkit/glue/resources/aliasb.cur',
+            '../webkit/glue/resources/cell.cur',
+            '../webkit/glue/resources/col_resize.cur',
+            '../webkit/glue/resources/copy.cur',
+            '../webkit/glue/resources/none.cur',
+            '../webkit/glue/resources/row_resize.cur',
+            '../webkit/glue/resources/vertical_text.cur',
+            '../webkit/glue/resources/zoom_in.cur',
+            '../webkit/glue/resources/zoom_out.cur',
 
             'app/chrome_dll.rc',
             'test/data/resource.rc',
@@ -421,8 +421,8 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(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_unscaled_resources.rc',
 
             'browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc',
           ],
@@ -1779,8 +1779,8 @@
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(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_unscaled_resources.rc',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 2a01142..c7d2221 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2128,8 +2128,8 @@
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
             '<(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_unscaled_resources.rc',
           ],
           'link_settings': {
             'libraries': [
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 5394e05..58ed602 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -41,7 +41,7 @@
   "net/base/net_resources.grd": {
     "includes": [4000],
   },
-  "ui/resources/ui_unscaled_resources.grd": {
+  "webkit/glue/resources/webkit_unscaled_resources.grd": {
     "includes": [4500],
   },
   "webkit/glue/resources/webkit_resources.grd": {
diff --git a/ui/resources/ui_unscaled_resources.grd b/ui/resources/ui_unscaled_resources.grd
deleted file mode 100644
index 46cae3b..0000000
--- a/ui/resources/ui_unscaled_resources.grd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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>
diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi
index 4008f0d..a522e92 100644
--- a/ui/ui_resources.gypi
+++ b/ui/ui_resources.gypi
@@ -25,15 +25,6 @@
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
-
-        {
-          'action_name': 'ui_unscaled_resources',
-          'variables': {
-            'grit_grd_file': 'resources/ui_unscaled_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-
       ],
       # gfx_resources.pak is used by DumpRenderTree.
       # TODO(oshima): Update DumpRenderTree.gyp to use new pak file and
diff --git a/webkit/glue/resources/README.txt b/webkit/glue/resources/README.txt
index 9ebea17..c5aaa7a 100644
--- a/webkit/glue/resources/README.txt
+++ b/webkit/glue/resources/README.txt
@@ -3,6 +3,18 @@ Mozilla source tree, where they are licensed under the MPL/GPL/LGPL.  While
 binary files do not contain a license block, I have pasted the relevant
 Mozilla license block below.
 
+aliasb.cur
+broken-image.gif
+cell.cur
+col_resize.cur
+copy.cur
+grab.cur
+grabbing.cur
+row_resize.cur
+vertical_text.cur
+zoom_in.cur
+zoom_out.cur
+
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
diff --git a/ui/resources/cursors/aliasb.cur b/webkit/glue/resources/aliasb.cur
index 8d9ac94..8d9ac94 100644
--- a/ui/resources/cursors/aliasb.cur
+++ b/webkit/glue/resources/aliasb.cur
diff --git a/ui/resources/cursors/cell.cur b/webkit/glue/resources/cell.cur
index decfbdc..decfbdc 100644
--- a/ui/resources/cursors/cell.cur
+++ b/webkit/glue/resources/cell.cur
diff --git a/ui/resources/cursors/col_resize.cur b/webkit/glue/resources/col_resize.cur
index 8f7f675..8f7f675 100644
--- a/ui/resources/cursors/col_resize.cur
+++ b/webkit/glue/resources/col_resize.cur
diff --git a/ui/resources/cursors/copy.cur b/webkit/glue/resources/copy.cur
index 87f1519c..87f1519c 100644
--- a/ui/resources/cursors/copy.cur
+++ b/webkit/glue/resources/copy.cur
diff --git a/ui/resources/cursors/hand_grab.cur b/webkit/glue/resources/hand_grab.cur
index 4cdf428..4cdf428 100644
--- a/ui/resources/cursors/hand_grab.cur
+++ b/webkit/glue/resources/hand_grab.cur
diff --git a/ui/resources/cursors/hand_grabbing.cur b/webkit/glue/resources/hand_grabbing.cur
index 0d95775..0d95775 100644
--- a/ui/resources/cursors/hand_grabbing.cur
+++ b/webkit/glue/resources/hand_grabbing.cur
diff --git a/ui/resources/cursors/none.cur b/webkit/glue/resources/none.cur
index 8fb6e5e..8fb6e5e 100644
--- a/ui/resources/cursors/none.cur
+++ b/webkit/glue/resources/none.cur
diff --git a/ui/resources/cursors/pan_east.cur b/webkit/glue/resources/pan_east.cur
index f7c0df3..f7c0df3 100644
--- a/ui/resources/cursors/pan_east.cur
+++ b/webkit/glue/resources/pan_east.cur
diff --git a/ui/resources/cursors/pan_middle.cur b/webkit/glue/resources/pan_middle.cur
index 52ae366..52ae366 100644
--- a/ui/resources/cursors/pan_middle.cur
+++ b/webkit/glue/resources/pan_middle.cur
diff --git a/ui/resources/cursors/pan_north.cur b/webkit/glue/resources/pan_north.cur
index 0c3a4ee..0c3a4ee 100644
--- a/ui/resources/cursors/pan_north.cur
+++ b/webkit/glue/resources/pan_north.cur
diff --git a/ui/resources/cursors/pan_north_east.cur b/webkit/glue/resources/pan_north_east.cur
index 4388fb8..4388fb8 100644
--- a/ui/resources/cursors/pan_north_east.cur
+++ b/webkit/glue/resources/pan_north_east.cur
diff --git a/ui/resources/cursors/pan_north_west.cur b/webkit/glue/resources/pan_north_west.cur
index d47089e..d47089e 100644
--- a/ui/resources/cursors/pan_north_west.cur
+++ b/webkit/glue/resources/pan_north_west.cur
diff --git a/ui/resources/cursors/pan_south.cur b/webkit/glue/resources/pan_south.cur
index f5d813b..f5d813b 100644
--- a/ui/resources/cursors/pan_south.cur
+++ b/webkit/glue/resources/pan_south.cur
diff --git a/ui/resources/cursors/pan_south_east.cur b/webkit/glue/resources/pan_south_east.cur
index ba9742e..ba9742e 100644
--- a/ui/resources/cursors/pan_south_east.cur
+++ b/webkit/glue/resources/pan_south_east.cur
diff --git a/ui/resources/cursors/pan_south_west.cur b/webkit/glue/resources/pan_south_west.cur
index 4f62984..4f62984 100644
--- a/ui/resources/cursors/pan_south_west.cur
+++ b/webkit/glue/resources/pan_south_west.cur
diff --git a/ui/resources/cursors/pan_west.cur b/webkit/glue/resources/pan_west.cur
index 9068925..9068925 100644
--- a/ui/resources/cursors/pan_west.cur
+++ b/webkit/glue/resources/pan_west.cur
diff --git a/ui/resources/cursors/row_resize.cur b/webkit/glue/resources/row_resize.cur
index a7369d3..a7369d3 100644
--- a/ui/resources/cursors/row_resize.cur
+++ b/webkit/glue/resources/row_resize.cur
diff --git a/ui/resources/cursors/vertical_text.cur b/webkit/glue/resources/vertical_text.cur
index 3de04eb..3de04eb 100644
--- a/ui/resources/cursors/vertical_text.cur
+++ b/webkit/glue/resources/vertical_text.cur
diff --git a/ui/resources/cursors/zoom_in.cur b/webkit/glue/resources/zoom_in.cur
index b594d79..b594d79 100644
--- a/ui/resources/cursors/zoom_in.cur
+++ b/webkit/glue/resources/zoom_in.cur
diff --git a/ui/resources/cursors/zoom_out.cur b/webkit/glue/resources/zoom_out.cur
index 7e495fb..7e495fb 100644
--- a/ui/resources/cursors/zoom_out.cur
+++ b/webkit/glue/resources/zoom_out.cur
diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc
index df2e402..aa64aa7 100644
--- a/webkit/glue/webcursor_win.cc
+++ b/webkit/glue/webcursor_win.cc
@@ -4,7 +4,7 @@
 
 #include "base/logging.h"
 #include "base/pickle.h"
-#include "grit/ui_unscaled_resources.h"
+#include "grit/webkit_unscaled_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "ui/gfx/icon_util.h"
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 7a47d14..593d296 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -40,6 +40,13 @@
           },
           'includes': [ '../../build/grit_action.gypi' ],
         },
+        {
+          'action_name': 'webkit_unscaled_resources',
+          'variables': {
+            'grit_grd_file': 'resources/webkit_unscaled_resources.grd',
+          },
+          'includes': [ '../../build/grit_action.gypi' ],
+        },
       ],
       'includes': [ '../../build/grit_target.gypi' ],
       'direct_dependent_settings': {
@@ -92,7 +99,6 @@
         '<(DEPTH)/ui/gl/gl.gyp:gl',
         '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
         '<(DEPTH)/ui/ui.gyp:ui',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
@@ -106,7 +112,6 @@
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
-        '<(SHARED_INTERMEDIATE_DIR)/ui',
       ],
       'sources': [
         # This list contains all .h, .cc, and .mm files in glue except for
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': {