Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4775)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed resource ID conflict with devtools Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | skia/ext/skia_utils_mac.h » ('j') | ui/gfx/image_mac_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 6646ccbcd3bb6ffb9bc3e88e5dee3e5e00dde90d..47e86f58fe0ece64c38c1d6d808eb751bda0cdae 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -31,6 +31,7 @@
'app/policy/cloud_policy_codegen.gyp:policy',
'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
'theme_resources',
+ 'theme_resources_standard',
'../base/base.gyp:test_support_base',
'../content/content.gyp:content_gpu',
'../ipc/ipc.gyp:test_support_ipc',
@@ -212,6 +213,7 @@
'chrome_resources',
'chrome_strings',
'theme_resources',
+ 'theme_resources_standard',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
@@ -351,6 +353,7 @@
'test_support_common',
'test_support_ui',
'theme_resources',
+ 'theme_resources_standard',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../third_party/libxml/libxml.gyp:libxml',
@@ -537,6 +540,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -2082,6 +2086,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -2438,6 +2443,7 @@
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
# TODO(alekseys): port sidebar to linux/mac.
@@ -2591,6 +2597,7 @@
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
],
@@ -2710,6 +2717,7 @@
'test_support_common',
'test_support_ui',
'theme_resources',
+ 'theme_resources_standard',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
@@ -2812,6 +2820,7 @@
'test_support_common',
'test_support_ui',
'theme_resources',
+ 'theme_resources_standard',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
@@ -2846,6 +2855,7 @@
'test_support_common',
'test_support_ui',
'theme_resources',
+ 'theme_resources_standard',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
@@ -2875,6 +2885,7 @@
'test_support_common',
'test_support_ui',
'theme_resources',
+ 'theme_resources_standard',
'../base/base.gyp:base',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
@@ -3162,6 +3173,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
@@ -3253,6 +3265,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -3569,6 +3582,7 @@
'chrome_resources',
'chrome_strings',
'theme_resources',
+ 'theme_resources_standard',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | skia/ext/skia_utils_mac.h » ('j') | ui/gfx/image_mac_unittest.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698