Dissociate ui_resources target from ui.gyp.

This is the first step for moving ui.gyp into ui/base/

After this lands, Blink will be updated to reference the new file under
ui/resources.

Then the by-pass target will be removed from ui.gyp. And then we can
move it to its finall location.

BUG=299841
TEST=None
R=ben@chromium.org

Review URL: https://codereview.chromium.org/74853003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236099 0039d316-1c4b-4281-b951-d872f2087c98

27 files changed, 72 insertions, 64 deletions

diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 6cfe557..acc2e2c 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -55,7 +55,7 @@
       'dependencies': [
         '<(DEPTH)/content/content_resources.gyp:content_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
       ],
       'variables': {
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 6149494..3331bef 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -36,8 +36,8 @@
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/oak/oak.gyp:oak',
+        '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/ui.gyp:ui',
-        '../ui/ui.gyp:ui_resources',
         '../ui/views/controls/webview/webview.gyp:webview',
         '../ui/views/views.gyp:views',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
@@ -720,8 +720,8 @@
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/message_center/message_center.gyp:message_center_test_support',
+        '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/ui.gyp:ui',
-        '../ui/ui.gyp:ui_resources',
         '../ui/ui_unittests.gyp:ui_test_support',
         '../ui/views/views.gyp:views',
         '../ui/views/views.gyp:views_examples_with_content_lib',
@@ -927,8 +927,8 @@
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
+        '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/ui.gyp:ui',
-        '../ui/ui.gyp:ui_resources',
         '../ui/views/views.gyp:views',
         '../ui/views/views.gyp:views_examples_lib',
         '../ui/views/views.gyp:views_examples_with_content_lib',
diff --git a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
index 7358c0e..6817ea6 100644
--- a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
+++ b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
@@ -17,8 +17,8 @@
         '../../../../build/linux/system.gyp:gtk',
         '../../../../skia/skia.gyp:skia',
         '../../../../ui/base/strings/ui_strings.gyp:ui_strings',
+        '../../../../ui/resources/ui_resources.gyp:ui_resources',
         '../../../../ui/ui.gyp:ui',
-        '../../../../ui/ui.gyp:ui_resources',
         '../../../../ui/views/views.gyp:views',
         '../../../chrome_resources.gyp:chrome_extra_resources',
         '../../../chrome_resources.gyp:chrome_resources',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 57207a0..f22fd7b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -64,9 +64,9 @@
         '../ui/events/events.gyp:events_base',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/message_center/message_center.gyp:message_center',
+        '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
         '../ui/ui.gyp:ui',
-        '../ui/ui.gyp:ui_resources',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
       ],
       'include_dirs': [
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 0844b7a..326dd69 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -84,14 +84,14 @@
         '../third_party/re2/re2.gyp:re2',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
+        '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/surface/surface.gyp:surface',
         '../ui/ui.gyp:ui',
-        '../ui/ui.gyp:ui_resources',
+        '../ui/views/controls/webview/webview.gyp:webview',
         '../ui/views/controls/webview/webview.gyp:webview',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../url/url.gyp:url_lib',
         '../v8/tools/gyp/v8.gyp:v8',
-        '../ui/views/controls/webview/webview.gyp:webview',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '../webkit/glue/webkit_glue.gyp:glue',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 06136b9..2cecbfe 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -44,8 +44,8 @@
         '../third_party/webrtc/modules/modules.gyp:desktop_capture',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/gfx/gfx.gyp:gfx',
+        '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/ui.gyp:ui',
-        '../ui/ui.gyp:ui_resources',
         '../url/url.gyp:url_lib',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 63b2868..dad6038 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -49,7 +49,7 @@
         '../ui/native_theme/native_theme.gyp:native_theme',
         '../ui/snapshot/snapshot.gyp:snapshot',
         '../ui/ui.gyp:ui',
-        '../ui/ui.gyp:ui_resources',
+        '../ui/resources/ui_resources.gyp:ui_resources',
         '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
       ],
       'include_dirs': [
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 10c8b85..57a6cfd 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -48,7 +48,7 @@
         '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/third_party/zlib/google/zip.gyp:zip',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
       ],
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index ad6c258..9079506 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -303,7 +303,7 @@
       'dependencies': [
         'chrome_unscaled_resources',
         'theme_resources_gen',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
       ],
     },
     {
@@ -352,7 +352,7 @@
         '<(DEPTH)/components/component_strings.gyp:component_strings',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
       ],
       'actions': [
         {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index b8cd040..b343f3b 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -470,9 +470,9 @@
             '../third_party/wtl/include',
           ],
           'dependencies': [
-            'chrome.gyp:chrome_version_resources',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
-            '../ui/ui.gyp:ui_resources',
+            '../ui/resources/ui_resources.gyp:ui_resources',
+            'chrome.gyp:chrome_version_resources',
           ],
           'sources': [
             '../ui/resources/cursors/aliasb.cur',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 6bcd9d0..16bdb24 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -488,7 +488,7 @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
-        '../ui/ui.gyp:ui_resources',
+        '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/ui_unittests.gyp:ui_test_support',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index cf85067..9b33acb 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -409,7 +409,7 @@
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        '../ui/ui.gyp:ui_resources',
+        '../ui/resources/ui_resources.gyp:ui_resources',
         'chrome_frame_ie',
         'chrome_tab_idl',
         'npchrome_frame',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 4166447..ff24f75 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -4,7 +4,6 @@
 
 {
   'dependencies': [
-    'browser/speech/proto/speech_proto.gyp:speech_proto',
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
@@ -16,9 +15,10 @@
     '../third_party/zlib/zlib.gyp:zlib',
     '../ui/events/events.gyp:events_base',
     '../ui/gfx/gfx.gyp:gfx',
+    '../ui/resources/ui_resources.gyp:ui_resources',
     '../ui/snapshot/snapshot.gyp:snapshot',
     '../ui/ui.gyp:ui',
-    '../ui/ui.gyp:ui_resources',
+    'browser/speech/proto/speech_proto.gyp:speech_proto',
   ],
   'include_dirs': [
     '..',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 908a62a..b0bf4da 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -319,7 +319,7 @@
         'content_shell_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
       ],
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index a9c6fc0..50b21a3 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -14,9 +14,9 @@
         '../testing/gtest.gyp:gtest',
         '../ui/events/events.gyp:events_base',
         '../ui/gfx/gfx.gyp:gfx',
+        '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/ui.gyp:keycode_converter',
         '../ui/ui.gyp:ui',
-        '../ui/ui.gyp:ui_resources',
         '../ui/ui_unittests.gyp:ui_test_support',
         '../url/url.gyp:url_lib',
         'browser/speech/proto/speech_proto.gyp:speech_proto',
@@ -895,10 +895,10 @@
             '../third_party/mesa/mesa.gyp:osmesa',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gl/gl.gyp:gl',
+            '../ui/resources/ui_resources.gyp:ui_resources',
             '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
             '../ui/snapshot/snapshot.gyp:snapshot',
             '../ui/ui.gyp:ui',
-            '../ui/ui.gyp:ui_resources',
             '../webkit/child/webkit_child.gyp:webkit_child',
             '../webkit/glue/webkit_glue.gyp:glue',
             '../webkit/renderer/webkit_renderer.gyp:webkit_renderer',
diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
index 5aca2e5..0adfed9 100644
--- a/ui/app_list/app_list.gyp
+++ b/ui/app_list/app_list.gyp
@@ -18,8 +18,8 @@
         '../base/strings/ui_strings.gyp:ui_strings',
         '../compositor/compositor.gyp:compositor',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
       ],
       'defines': [
         'APP_LIST_IMPLEMENTATION',
@@ -176,8 +176,8 @@
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../compositor/compositor.gyp:compositor',
+        '../resources/ui_resources.gyp:ui_resources',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
         '../ui_unittests.gyp:run_ui_unittests',
         '../ui_unittests.gyp:ui_test_support',
         'app_list',
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 38a91d89..b0a7335 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -21,8 +21,8 @@
         '../events/events.gyp:events',
         '../events/events.gyp:events_base',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
       ],
       'defines': [
         'AURA_IMPLEMENTATION',
@@ -191,7 +191,7 @@
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
       ],
       'variables': {
         'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
@@ -230,8 +230,8 @@
         '../compositor/compositor.gyp:compositor_test_support',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
         'aura',
         'aura_test_support',
       ],
@@ -255,8 +255,8 @@
         '../compositor/compositor.gyp:compositor_test_support',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
         'aura',
         'aura_test_support',
       ],
@@ -275,14 +275,14 @@
         '../../chrome/chrome_resources.gyp:packed_resources',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
-        '../compositor/compositor.gyp:compositor_test_support',
         '../compositor/compositor.gyp:compositor',
+        '../compositor/compositor.gyp:compositor_test_support',
         '../events/events.gyp:events',
         '../events/events.gyp:events_base',
         '../gfx/gfx.gyp:gfx',
         '../gl/gl.gyp:gl',
+        '../resources/ui_resources.gyp:ui_resources',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
         '../ui_unittests.gyp:ui_test_support',
         'aura_test_support',
         'aura',
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index ae25017..a2d3a75 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -63,7 +63,7 @@
           # TODO(sky): before we make this real need to remove
           # IDR_BITMAP_BRUSH_IMAGE.
           'dependencies': [
-            '<(DEPTH)/ui/ui.gyp:ui_resources',
+            '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
             '<(angle_path)/src/build_angle.gyp:libEGL',
             '<(angle_path)/src/build_angle.gyp:libGLESv2',
           ],
@@ -110,8 +110,8 @@
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
         '<(DEPTH)/ui/gl/gl.gyp:gl',
+        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/ui/ui.gyp:ui',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
         'compositor',
         'compositor_test_support',
       ],
diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp
index bee5949..42d0aef 100644
--- a/ui/message_center/message_center.gyp
+++ b/ui/message_center/message_center.gyp
@@ -18,8 +18,8 @@
         '../../url/url.gyp:url_lib',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
       ],
       'defines': [
         'MESSAGE_CENTER_IMPLEMENTATION',
@@ -171,11 +171,11 @@
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../../url/url.gyp:url_lib',
+        '../../url/url.gyp:url_lib',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
         '../ui.gyp:ui',
         '../ui_unittests.gyp:run_ui_unittests',
-        '../ui.gyp:ui_resources',
-        '../../url/url.gyp:url_lib',
         'message_center',
         'message_center_test_support',
       ],
diff --git a/ui/native_theme/native_theme.gyp b/ui/native_theme/native_theme.gyp
index 2edba03..9fbe897 100644
--- a/ui/native_theme/native_theme.gyp
+++ b/ui/native_theme/native_theme.gyp
@@ -15,8 +15,8 @@
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../skia/skia.gyp:skia',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
       ],
       'defines': [
         'NATIVE_THEME_IMPLEMENTATION',
diff --git a/ui/oak/oak.gyp b/ui/oak/oak.gyp
index d0a5b1d..00a8dfc 100644
--- a/ui/oak/oak.gyp
+++ b/ui/oak/oak.gyp
@@ -20,8 +20,8 @@
         '../compositor/compositor.gyp:compositor',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
         '../views/views.gyp:views',
       ],
       'defines': [
diff --git a/ui/ui_resources.gypi b/ui/resources/ui_resources.gyp
index 6a557bf..7a26a83 100644
--- a/ui/ui_resources.gypi
+++ b/ui/resources/ui_resources.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -14,26 +14,26 @@
         {
           'action_name': 'ui_resources',
           'variables': {
-            'grit_grd_file': 'resources/ui_resources.grd',
+            'grit_grd_file': 'ui_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ '../../build/grit_action.gypi' ],
         },
         {
           'action_name': 'webui_resources',
           'variables': {
-            'grit_grd_file': 'webui/resources/webui_resources.grd',
+            'grit_grd_file': '../webui/resources/webui_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ '../../build/grit_action.gypi' ],
         },
         {
           'action_name': 'ui_unscaled_resources',
           'variables': {
-            'grit_grd_file': 'resources/ui_unscaled_resources.grd',
+            'grit_grd_file': 'ui_unscaled_resources.grd',
           },
-          'includes': [ '../build/grit_action.gypi' ],
+          'includes': [ '../../build/grit_action.gypi' ],
         },
       ],
-      'includes': [ '../build/grit_target.gypi' ],
+      'includes': [ '../../build/grit_target.gypi' ],
     },
     {
       # We build a minimal set of resources so WebKit in content_shell has
@@ -41,11 +41,11 @@
       'target_name': 'ui_test_pak',
       'type': 'none',
       'dependencies': [
-        'base/strings/ui_strings.gyp:ui_strings',
+        '../base/strings/ui_strings.gyp:ui_strings',
         'ui_resources',
       ],
       'variables': {
-        'repack_path': '../tools/grit/grit/format/repack.py',
+        'repack_path': '../../tools/grit/grit/format/repack.py',
       },
       'actions': [
         {
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 49b6467..d8adf59 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -6,11 +6,19 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    'ui_resources.gypi',
-  ],
   'targets': [
     {
+      # TODO(tfarina): Remove this target after Blink is updated.
+      'target_name': 'ui_resources',
+      'type': 'none',
+      'dependencies': [
+        'resources/ui_resources.gyp:ui_resources',
+      ],
+      'export_dependent_settings': [
+        'resources/ui_resources.gyp:ui_resources',
+      ]
+    },
+    {
       'target_name': 'ui',
       'type': '<(component)',
       'dependencies': [
@@ -28,7 +36,7 @@
         'base/strings/ui_strings.gyp:ui_strings',
         'events/events.gyp:events_base',
         'gfx/gfx.gyp:gfx',
-        'ui_resources',
+        'resources/ui_resources.gyp:ui_resources',
       ],
       'defines': [
         'UI_IMPLEMENTATION',
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp
index 3d58e92..5ce67c2 100644
--- a/ui/ui_unittests.gyp
+++ b/ui/ui_unittests.gyp
@@ -93,11 +93,11 @@
         '../url/url.gyp:url_lib',
         'base/strings/ui_strings.gyp:ui_strings',
         'events/events.gyp:events_base',
+        'resources/ui_resources.gyp:ui_resources',
         'run_ui_unittests',
         'shell_dialogs/shell_dialogs.gyp:shell_dialogs',
         'ui.gyp:keycode_converter',
         'ui.gyp:ui',
-        'ui.gyp:ui_resources',
         'ui_test_support',
       ],
       # iOS uses a small subset of ui. common_sources are the only files that
diff --git a/ui/views/linux_ui/linux_ui.gyp b/ui/views/linux_ui/linux_ui.gyp
index 7feb238..1f87a1a 100644
--- a/ui/views/linux_ui/linux_ui.gyp
+++ b/ui/views/linux_ui/linux_ui.gyp
@@ -14,9 +14,9 @@
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../skia/skia.gyp:skia',
-        '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
         '../native_theme/native_theme.gyp:native_theme',
+        '../resources/ui_resources.gyp:ui_resources',
+        '../ui.gyp:ui',
       ],
       'defines': [
         'LINUX_UI_IMPLEMENTATION',
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 80e50c3..8937510 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -34,8 +34,8 @@
         '../events/events.gyp:events_base',
         '../gfx/gfx.gyp:gfx',
         '../native_theme/native_theme.gyp:native_theme',
+        '../resources/ui_resources.gyp:ui_resources',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
       ],
       'defines': [
         'VIEWS_IMPLEMENTATION',
@@ -710,9 +710,9 @@
         '../compositor/compositor.gyp:compositor_test_support',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
+        '../resources/ui_resources.gyp:ui_test_pak',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
-        '../ui.gyp:ui_test_pak',
         '../ui_unittests.gyp:ui_test_support',
         'views',
         'views_test_support',
@@ -865,9 +865,9 @@
         '../../third_party/icu/icu.gyp:icuuc',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
+        '../resources/ui_resources.gyp:ui_test_pak',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
-        '../ui.gyp:ui_test_pak',
         'views',
       ],
       'include_dirs': [
@@ -959,9 +959,9 @@
         '../../url/url.gyp:url_lib',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
+        '../resources/ui_resources.gyp:ui_test_pak',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
-        '../ui.gyp:ui_test_pak',
         'controls/webview/webview.gyp:webview',
         'views',
       ],
@@ -1050,9 +1050,9 @@
         '../../third_party/icu/icu.gyp:icuuc',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
+        '../resources/ui_resources.gyp:ui_resources',
+        '../resources/ui_resources.gyp:ui_test_pak',
         '../ui.gyp:ui',
-        '../ui.gyp:ui_resources',
-        '../ui.gyp:ui_test_pak',
         '../wm/wm.gyp:wm_test_support',
         'views',
         'views_examples_with_content_lib',
diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp
index 508c1e4..0a162bc 100644
--- a/webkit/common/webkit_common.gyp
+++ b/webkit/common/webkit_common.gyp
@@ -21,8 +21,8 @@
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
+        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/ui/ui.gyp:ui',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
       ],