Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index f118bb649839886bcf7492ab8f060bf4ecee0274..1e59beaa6a39c2fd5e9691947e5ae16dcbc6e175 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -645,11 +645,11 @@ |
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
'<(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_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
@@ -2357,11 +2357,11 @@ |
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
'<(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_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
], |
@@ -3213,11 +3213,11 @@ |
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
'<(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_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
], |
@@ -3479,11 +3479,11 @@ |
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
'<(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_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
], |
@@ -3601,11 +3601,11 @@ |
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
'<(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_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
], |
@@ -3968,9 +3968,9 @@ |
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |
], |
'include_dirs': [ |
'<(DEPTH)/third_party/wtl/include', |
@@ -4087,9 +4087,9 @@ |
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |
], |
'include_dirs': [ |
'<(DEPTH)/third_party/wtl/include', |