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

Unified Diff: chrome/chrome.gyp

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed touchui 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
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index c3ddf9385865b45029db45ca8bd815dc3f255ce1..cca502765a7b0e787220e7e971346b41f3e8de3d 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -240,6 +240,36 @@
'includes': [ '../build/grit_target.gypi' ],
},
{
+ 'target_name': 'theme_resources_large',
+ 'type': 'none',
+ 'msvs_guid' : 'A158FB0A-25E4-6523-6B5A-4BB294B73D31',
+ 'actions': [
+ {
+ 'action_name': 'theme_resources_large',
+ 'variables': {
+ 'grit_grd_file': 'app/theme/theme_resources_large.grd',
+ },
+ 'includes': [ '../build/grit_action.gypi' ],
+ },
+ ],
+ 'includes': [ '../build/grit_target.gypi' ],
+ },
+ {
+ 'target_name': 'theme_resources_standard',
+ 'type': 'none',
+ 'msvs_guid' : 'A158FB0A-25E4-6523-6B5A-4BB294B73D31',
+ 'actions': [
+ {
+ 'action_name': 'theme_resources_standard',
+ 'variables': {
+ 'grit_grd_file': 'app/theme/theme_resources_standard.grd',
+ },
+ 'includes': [ '../build/grit_action.gypi' ],
+ },
+ ],
+ 'includes': [ '../build/grit_target.gypi' ],
+ },
+ {
'target_name': 'platform_locale_settings',
'type': 'none',
'actions': [
@@ -355,6 +385,7 @@
'chrome_strings',
'../net/net.gyp:http_server',
'theme_resources',
+ 'theme_resources_standard',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
@@ -1409,6 +1440,7 @@
'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12',
'dependencies': [
'theme_resources',
+ 'theme_resources_standard',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
@@ -1496,10 +1528,22 @@
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
],
+ 'conditions': [
+ ['touchui=="0"', {
+ 'theme_resources_inputs': [
+ '<(grit_out_dir)/theme_resources_standard.pak',
+ ],
+ }, { # else: touchui!="0"
+ 'theme_resources_inputs': [
+ '<(grit_out_dir)/theme_resources_large.pak',
+ ],
+ }],
+ ],
},
'inputs': [
'<(repack_path)',
'<@(pak_inputs)',
+ '<@(theme_resources_inputs)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/repack/chrome.pak',

Powered by Google App Engine
This is Rietveld 408576698