Skip to content

Commit

Permalink
Remove webkit_chromium_resources.pak entries.
Browse files Browse the repository at this point in the history 
webkit_chromium_resources.pak was kept along side with blink_resources.pak,
while DumpRenderTree was being updated on the Blink side, since that already
happened and Blink has rolled into Chromium, we should be able to remove this
now.

BUG=265748
TBR=abarth@chromium.org, thestig@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215210 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
tfarina@chromium.org committed Aug 2, 2013
1 parent 029e6da commit 3c0cc1d
Show file tree
Hide file tree
Showing 14 changed files with 3 additions and 25 deletions.
1 change: 0 additions & 1 deletion android_webview/android_webview.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
},
Expand Down
1 change: 0 additions & 1 deletion chrome/chrome_dll.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 0 additions & 1 deletion chrome/chrome_repack_chrome.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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', {
Expand Down
4 changes: 0 additions & 4 deletions chrome/chrome_tests.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,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',
],
Expand Down Expand Up @@ -1924,7 +1923,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',
Expand Down Expand Up @@ -2163,7 +2161,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',
Expand Down Expand Up @@ -2547,7 +2544,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',
Expand Down
1 change: 0 additions & 1 deletion chrome/test/gpu/test_support_gpu.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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', {
Expand Down
1 change: 0 additions & 1 deletion content/DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion content/browser/gpu/test_support_gpu.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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', {
Expand Down
1 change: 0 additions & 1 deletion content/content_shell.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
Expand Down
1 change: 0 additions & 1 deletion content/content_tests.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down
3 changes: 0 additions & 3 deletions tools/gritsettings/resource_ids
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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],
},
Expand Down
2 changes: 1 addition & 1 deletion webkit/child/webkitplatformsupport_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion webkit/common/cursors/webcursor_mac.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion webkit/support/platform_support_win.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 0 additions & 7 deletions webkit/webkit_resources.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand Down

0 comments on commit 3c0cc1d

Please sign in to comment.