diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 16:53:04 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 16:53:04 +0000 |
| commit | 3ca9a76e1fa625c27c3f23d5071b213a7b5f4102 (patch) | |
| tree | 973e7f6eeed9eb73c0766689e61ba96efaed6fdc /tools/grit | |
| parent | 028c4ec16f1af021ee2b04006b8f8ca4de21d7c3 (diff) | |
| download | chromium_src-3ca9a76e1fa625c27c3f23d5071b213a7b5f4102.zip chromium_src-3ca9a76e1fa625c27c3f23d5071b213a7b5f4102.tar.gz chromium_src-3ca9a76e1fa625c27c3f23d5071b213a7b5f4102.tar.bz2 | |
Revert 82497 - Split out large icons into a separate resource pakThis is a part of r82185 that was reverted. The change was reverted because it caused a performance regression.I'm checking in just the reorganization code to narrow down exactly which part of the change caused the regression.The only code change here is some header includes. If this change passes the perf bot then my next change will be to load the new resource pak.BUG=NoneTEST=NoneReview URL: http://codereview.chromium.org/6883110
TBR=sail@chromium.org
Review URL: http://codereview.chromium.org/6879113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/grit')
| -rw-r--r-- | tools/grit/grit/format/resource_map.py | 4 | ||||
| -rw-r--r-- | tools/grit/resource_ids | 9 |
2 files changed, 1 insertions, 12 deletions
diff --git a/tools/grit/grit/format/resource_map.py b/tools/grit/grit/format/resource_map.py index 4527af8..5ae135b 100644 --- a/tools/grit/grit/format/resource_map.py +++ b/tools/grit/grit/format/resource_map.py @@ -49,14 +49,10 @@ class HeaderTopLevel(interface.ItemFormatter): #include <stddef.h> -#ifndef GRIT_RESOURCE_MAP_STRUCT_ -#define GRIT_RESOURCE_MAP_STRUCT_ struct GritResourceMap { const char* const name; int value; }; -#endif // GRIT_RESOURCE_MAP_STRUCT_ - extern const GritResourceMap %(map_name)s[]; extern const size_t %(map_name)sSize; ''' % { 'year': util.GetCurrentYear(), diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids index c871600..b89b95de 100644 --- a/tools/grit/resource_ids +++ b/tools/grit/resource_ids @@ -130,12 +130,5 @@ # This file is generated during the build. "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": { "includes": [20500], - }, - # All standard and large theme resources should have the same IDs. - "chrome/app/theme/theme_resources_standard.grd": { - "includes": [21000], - }, - "chrome/app/theme/theme_resources_large.grd": { - "includes": [21000], - }, + } } |