Skip to content

Commit

Permalink
Switch Chromium to use Blink's blink_resources.grd
Browse files Browse the repository at this point in the history 
WebKit.grd is deprecated, so we update it public/blink_resources.grd.

R=darin@chromium.org, joth@chromium.org, thestig@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213636 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
tfarina@chromium.org committed Jul 25, 2013
1 parent 08be10f commit 5c58648
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 25 deletions.
2 changes: 1 addition & 1 deletion android_webview/android_webview.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
],
},
Expand Down
2 changes: 1 addition & 1 deletion chrome/chrome_dll.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
'<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_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/blink_resources.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
Expand Down
2 changes: 1 addition & 1 deletion chrome/chrome_repack_chrome.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
],
}],
['enable_extensions==1', {
Expand Down
8 changes: 4 additions & 4 deletions chrome/chrome_tests.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@
'<(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/blink_resources.rc',

'browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc',
],
Expand Down Expand Up @@ -1923,7 +1923,7 @@
'<(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/blink_resources.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
Expand Down Expand Up @@ -2161,7 +2161,7 @@
'<(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/blink_resources.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
Expand Down Expand Up @@ -2544,7 +2544,7 @@
'<(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/blink_resources.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
Expand Down
2 changes: 1 addition & 1 deletion chrome/chrome_tests_unit.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2331,7 +2331,7 @@
'<(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/blink_resources.rc',
],
'link_settings': {
'libraries': [
Expand Down
2 changes: 1 addition & 1 deletion chrome/test/gpu/test_support_gpu.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
'<(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)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
],
'conditions': [
['win_use_allocator_shim==1', {
Expand Down
2 changes: 1 addition & 1 deletion content/DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ include_rules = [
"-cc/base/scoped_ptr_vector.h",

"+crypto",
"+grit/blink_resources.h",
"+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
2 changes: 1 addition & 1 deletion content/browser/gpu/test_support_gpu.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
],
'conditions': [
['win_use_allocator_shim==1', {
Expand Down
2 changes: 1 addition & 1 deletion content/content_shell.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
],
Expand Down
2 changes: 1 addition & 1 deletion content/content_tests.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@
# 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)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
],
'dependencies': [
Expand Down
8 changes: 1 addition & 7 deletions tools/gritsettings/resource_ids
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,9 @@
"chrome_frame/resources/chrome_frame_resources.grd": {
"includes": [8000],
},
# WebKit.grd can be in two different places depending on whether we are
# in a chromium checkout or a webkit-only checkout.
"third_party/WebKit/Source/WebKit/chromium/WebKit.grd": {
"third_party/WebKit/public/blink_resources.grd": {
"includes": [8500],
},
"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 @@ -27,7 +27,7 @@
#include "base/sys_info.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
3 changes: 1 addition & 2 deletions webkit/common/cursors/webcursor_mac.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@
#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"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/point_conversions.h"
#include "ui/gfx/size_conversions.h"


using WebKit::WebCursorInfo;
using WebKit::WebSize;

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
2 changes: 1 addition & 1 deletion webkit/webkit_resources.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{
'action_name': 'blink_chromium_resources',
'variables': {
'grit_grd_file': '../third_party/WebKit/Source/WebKit/chromium/WebKit.grd',
'grit_grd_file': '../third_party/WebKit/public/blink_resources.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
Expand Down

0 comments on commit 5c58648

Please sign in to comment.