Index: chrome/chrome_tests.gypi |
=================================================================== |
--- chrome/chrome_tests.gypi (revision 147292) |
+++ chrome/chrome_tests.gypi (working copy) |
@@ -646,11 +646,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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
@@ -2356,11 +2356,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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
], |
@@ -3226,11 +3226,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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
], |
@@ -3492,11 +3492,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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
], |
@@ -3614,11 +3614,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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', |
], |
@@ -3981,9 +3981,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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc', |
], |
'include_dirs': [ |
'<(DEPTH)/third_party/wtl/include', |
@@ -4100,9 +4100,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_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', |
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', |
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc', |
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc', |
], |
'include_dirs': [ |
'<(DEPTH)/third_party/wtl/include', |