diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 299dc1278369e..d353ad10635f0 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -54,7 +54,6 @@ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', ], }, diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index be312271f8a38..3ddb424bb455e 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -148,7 +148,6 @@ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi index 80683c5c3adb8..a89543575fe1c 100644 --- a/chrome/chrome_repack_chrome.gypi +++ b/chrome/chrome_repack_chrome.gypi @@ -16,7 +16,6 @@ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', ], }], ['enable_extensions==1', { diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index ef0ee466cfc45..3902617374122 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -456,7 +456,6 @@ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 'browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc', ], @@ -1926,7 +1925,6 @@ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', @@ -2165,7 +2163,6 @@ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', @@ -2549,7 +2546,6 @@ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 284d35ddbe127..d8a0debb1d551 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2368,7 +2368,6 @@ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'link_settings': { 'libraries': [ diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi index 4be0e52595270..083c0e3c8f9ff 100644 --- a/chrome/test/gpu/test_support_gpu.gypi +++ b/chrome/test/gpu/test_support_gpu.gypi @@ -60,7 +60,6 @@ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'conditions': [ ['win_use_allocator_shim==1', { diff --git a/content/DEPS b/content/DEPS index f57609a8678f7..11aa6bd6389fd 100644 --- a/content/DEPS +++ b/content/DEPS @@ -31,7 +31,6 @@ include_rules = [ "+grit/content_resources.h", "+grit/ui_resources.h", "+grit/ui_strings.h", - "+grit/webkit_chromium_resources.h", "+grit/webkit_resources.h", "+grit/webkit_strings.h", "+grit/webui_resources_map.h", diff --git a/content/browser/gpu/test_support_gpu.gypi b/content/browser/gpu/test_support_gpu.gypi index f141069dbfda5..4892e9a38e9eb 100644 --- a/content/browser/gpu/test_support_gpu.gypi +++ b/content/browser/gpu/test_support_gpu.gypi @@ -29,7 +29,6 @@ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'conditions': [ ['win_use_allocator_shim==1', { diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 4bc7aafb46acf..4ffff1aea5c01 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -320,7 +320,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', ], diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 5affb8bd52e99..8db3a90247d69 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -896,7 +896,6 @@ # resulting .res files get referenced multiple times. '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', ], 'dependencies': [ diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index 800082135b770..0e6b848523730 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -66,9 +66,6 @@ "chrome_frame/resources/chrome_frame_resources.grd": { "includes": [8000], }, - "third_party/WebKit/Source/WebKit/chromium/WebKit.grd": { - "includes": [8500], - }, "ui/base/strings/app_locale_settings.grd": { "messages": [9000], }, diff --git a/webkit/child/webkitplatformsupport_impl.cc b/webkit/child/webkitplatformsupport_impl.cc index 364429db272d0..ccd988a1ebb61 100644 --- a/webkit/child/webkitplatformsupport_impl.cc +++ b/webkit/child/webkitplatformsupport_impl.cc @@ -26,7 +26,7 @@ #include "base/synchronization/lock.h" #include "base/time/time.h" #include "content/public/common/webplugininfo.h" -#include "grit/webkit_chromium_resources.h" +#include "grit/blink_resources.h" #include "grit/webkit_resources.h" #include "grit/webkit_strings.h" #include "net/base/data_url.h" diff --git a/webkit/common/cursors/webcursor_mac.mm b/webkit/common/cursors/webcursor_mac.mm index 0abc3e91492f3..1a1dc4436018e 100644 --- a/webkit/common/cursors/webcursor_mac.mm +++ b/webkit/common/cursors/webcursor_mac.mm @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" -#include "grit/webkit_chromium_resources.h" +#include "grit/blink_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/web/WebCursorInfo.h" diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc index f2585feff6263..58d78be97e795 100644 --- a/webkit/support/platform_support_win.cc +++ b/webkit/support/platform_support_win.cc @@ -12,7 +12,7 @@ #include "base/strings/string16.h" #include "base/strings/string_piece.h" #include "base/win/resource_util.h" -#include "grit/webkit_chromium_resources.h" +#include "grit/blink_resources.h" #include "grit/webkit_resources.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/support/test_webkit_platform_support.h" diff --git a/webkit/webkit_resources.gyp b/webkit/webkit_resources.gyp index 50f795e4e197f..8ce53a72b8b57 100644 --- a/webkit/webkit_resources.gyp +++ b/webkit/webkit_resources.gyp @@ -18,13 +18,6 @@ }, 'includes': [ '../build/grit_action.gypi' ], }, - { - 'action_name': 'webkit_chromium_resources', - 'variables': { - 'grit_grd_file': '../third_party/WebKit/Source/WebKit/chromium/WebKit.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, { 'action_name': 'blink_chromium_resources', 'variables': {