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

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: Added comments 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/browser/ui/webui/theme_source_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 0a6beb5566994d8d2be0652802b349d380bbe9b9..3da3e298228daff241e8fe228d1cb068457dfd2a 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -240,6 +240,34 @@
'includes': [ '../build/grit_target.gypi' ],
},
{
+ 'target_name': 'theme_resources_large',
+ 'type': 'none',
+ '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',
+ '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 +383,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',
@@ -1407,6 +1436,7 @@
'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12',
'dependencies': [
'theme_resources',
+ 'theme_resources_standard',
'../base/base.gyp:test_support_base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
@@ -1495,6 +1525,17 @@
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
],
+ 'conditions': [
+ ['touchui==0', {
+ 'pak_inputs': [
+ '<(grit_out_dir)/theme_resources_standard.pak',
+ ],
+ }, { # else: touchui!=0
+ 'pak_inputs': [
+ '<(grit_out_dir)/theme_resources_large.pak',
+ ],
+ }],
+ ],
},
'inputs': [
'<(repack_path)',
« no previous file with comments | « chrome/browser/ui/webui/theme_source_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698